Merge bk://kernel.bkbits.net/davem/net-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

arch/i386/kernel/dmi_scan.c

@@ -841,7 +841,7 @@ static __initdata struct dmi_blacklist dmi_blacklist[]={
 	{ acer_cpufreq_pst, "Acer Aspire", {
 			MATCH(DMI_SYS_VENDOR, "Insyde Software"),
 			MATCH(DMI_BIOS_VERSION, "3A71"),
-			NO_MATCH, NO_MATCH, NO_MATCH
+			NO_MATCH, NO_MATCH,
 			} },
 
 	{ NULL, }

arch/parisc/hpux/wrappers.S

@@ -129,7 +129,7 @@ fork_exit:
 	/* Set the return value for the child */
 
 hpux_child_return:
-#if CONFIG_SMP || CONFIG_PREEMPT
+#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
 	bl	schedule_tail, %r2
 	nop
 #endif

drivers/scsi/aic7xxx/aic7xxx_osm.c

@@ -404,9 +404,6 @@ static int aic7xxx_pci_parity = 0;
  * would result in never finding any devices :)
  */
 #ifndef CONFIG_AIC7XXX_PROBE_EISA_VL
-#define CONFIG_AIC7XXX_PROBE_EISA_VL n
-#endif
-#if CONFIG_AIC7XXX_PROBE_EISA_VL == n
 static int aic7xxx_no_probe = 1;
 #else
 static int aic7xxx_no_probe;

include/linux/smp_lock.h

@@ -5,7 +5,7 @@
 #include <linux/sched.h>
 #include <linux/spinlock.h>
 
-#if CONFIG_SMP || CONFIG_PREEMPT
+#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
 
 extern spinlock_t kernel_flag;
 

include/linux/tpqic02.h

@@ -12,7 +12,7 @@
 
 #include <linux/config.h>
 
-#if CONFIG_QIC02_TAPE || CONFIG_QIC02_TAPE_MODULE
+#if defined(CONFIG_QIC02_TAPE) || defined(CONFIG_QIC02_TAPE_MODULE)
 
 /* need to have QIC02_TAPE_DRIVE and QIC02_TAPE_IFC expand to something */
 #include <linux/mtio.h>