Hi!
This patch removes some gcc warnings about unused variables.
It also fixes some wrong #undef's in sym53c8xx_comm.h and adds a newline
to the generated drivers/pci/classlist.h
It patches cleanly to test7.
Please apply.
Thorsten.
--- linux-2.4.0-test5-pre3/arch/alpha/kernel/irq.c Thu Jul 6 18:05:44 2000
+++ linux-2.4.0-test5-pre3-work/arch/alpha/kernel/irq.c Fri Jul 21 17:49:43 2000
@@ -359,7 +359,9 @@
static void
register_irq_proc (unsigned int irq)
{
+#ifdef CONFIG_SMP
struct proc_dir_entry *entry;
+#endif
char name [MAX_NAMELEN];
if (!root_irq_dir || (irq_desc[irq].handler == &no_irq_type))
@@ -389,7 +391,9 @@
void
init_irq_proc (void)
{
+#ifdef CONFIG_SMP
struct proc_dir_entry *entry;
+#endif
int i;
/* create /proc/irq */
@@ -512,7 +516,10 @@
int
get_irq_list(char *buf)
{
- int i, j;
+ int i;
+#ifdef CONFIG_SMP
+ int j;
+#endif
struct irqaction * action;
char *p = buf;
diff -ur linux-2.4.0-test5-pre3/drivers/isdn/isdnloop/isdnloop.c linux-2.4.0-test5-pre3-work/drivers/isdn/isdnloop/isdnloop.c
--- linux-2.4.0-test5-pre3/drivers/isdn/isdnloop/isdnloop.c Mon Nov 8 00:34:00 1999
+++ linux-2.4.0-test5-pre3-work/drivers/isdn/isdnloop/isdnloop.c Fri Jul 21 17:06:49 2000
@@ -1079,6 +1079,8 @@
restore_flags(flags);
}
+
+#ifdef MODULE
/*
* Stop all cards before unload.
*/
@@ -1092,6 +1094,7 @@
p = p->next;
}
}
+#endif
/*
* Start a 'card'. Simulate card's boot message and set the phone
diff -ur linux-2.4.0-test5-pre3/drivers/pci/gen-devlist.c linux-2.4.0-test5-pre3-work/drivers/pci/gen-devlist.c
--- linux-2.4.0-test5-pre3/drivers/pci/gen-devlist.c Mon Mar 27 22:29:13 2000
+++ linux-2.4.0-test5-pre3-work/drivers/pci/gen-devlist.c Fri Jul 21 16:49:17 2000
@@ -115,7 +115,7 @@
#undef VENDOR\n\
#undef DEVICE\n\
#undef ENDVENDOR\n", devf);
- fputs("\n#undef CLASS", clsf);
+ fputs("\n#undef CLASS\n", clsf);
fclose(devf);
fclose(clsf);
diff -ur linux-2.4.0-test5-pre3/drivers/scsi/sym53c8xx_comm.h linux-2.4.0-test5-pre3-work/drivers/scsi/sym53c8xx_comm.h
--- linux-2.4.0-test5-pre3/drivers/scsi/sym53c8xx_comm.h Wed Jul 19 20:48:57 2000
+++ linux-2.4.0-test5-pre3-work/drivers/scsi/sym53c8xx_comm.h Fri Jul 21 16:57:26 2000
@@ -1545,10 +1545,10 @@
return retv;
}
-#undef SET_BIT 0
-#undef CLR_BIT 1
-#undef SET_CLK 2
-#undef CLR_CLK 3
+#undef SET_BIT
+#undef CLR_BIT
+#undef SET_CLK
+#undef CLR_CLK
/*
* Try reading Symbios NVRAM.
diff -ur linux-2.4.0-test5-pre3/drivers/sound/sound_firmware.c linux-2.4.0-test5-pre3-work/drivers/sound/sound_firmware.c
--- linux-2.4.0-test5-pre3/drivers/sound/sound_firmware.c Wed Mar 15 01:54:42 2000
+++ linux-2.4.0-test5-pre3-work/drivers/sound/sound_firmware.c Fri Jul 21 16:47:07 2000
@@ -7,7 +7,6 @@
#include <linux/unistd.h>
#include <asm/uaccess.h>
-static int errno;
static int do_mod_firmware_load(const char *fn, char **fp)
{
int fd;
-- | Thorsten Kranzkowski Internet: dl8bcu@gmx.net | | Mobile: ++49 170 1876134 Snail: Niemannsweg 30, 49201 Dissen, Germany | | Ampr: dl8bcu@db0lj.#rpl.deu.eu, dl8bcu@marvin.dl8bcu.ampr.org [44.130.8.19] | - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Thu Aug 31 2000 - 21:00:19 EST