[KJ] [PATCH][3/26] drivers/char/* - compile warning cleanup

[KJ] [PATCH][3/26] drivers/char/* - compile warning cleanup

[Stephen Biggs]

[-- Attachment #1: Mail message body --]
[-- Type: text/plain, Size: 1599 bytes --]

Description: compile warning cleanup - Add MODULE definition compile 
fence so MODULE_DEVICE_TABLE vars not declared when compiled into the 
kernel.

Signed-off-by: Stephen Biggs <yrgrknmxpzlk@gawab.com>

diff -Nurdp -X dontdiff-osdl linux-2.6.11-rc3-mm-original/drivers/char/applicom.c linux-2.6.11-rc3-mm/drivers/char/applicom.c
--- linux-2.6.11-rc3-mm-original/drivers/char/applicom.c	2005-02-03 03:56:48.000000000 +0200
+++ linux-2.6.11-rc3-mm/drivers/char/applicom.c	2005-02-07 15:37:40.000000000 +0200
@@ -65,6 +65,7 @@ static char *applicom_pci_devnames[] = {
 	"PCI2000PFB"
 };
 
+#ifdef MODULE
 static struct pci_device_id applicom_pci_tbl[] = {
 	{ PCI_VENDOR_ID_APPLICOM, PCI_DEVICE_ID_APPLICOM_PCIGENERIC,
 	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
@@ -75,6 +76,7 @@ static struct pci_device_id applicom_pci
 	{ 0 }
 };
 MODULE_DEVICE_TABLE(pci, applicom_pci_tbl);
+#endif
 
 MODULE_AUTHOR("David Woodhouse & Applicom International");
 MODULE_DESCRIPTION("Driver for Applicom Profibus card");
diff -Nurdp -X dontdiff-osdl linux-2.6.11-rc3-mm-original/drivers/char/sx.c linux-2.6.11-rc3-mm/drivers/char/sx.c
--- linux-2.6.11-rc3-mm-original/drivers/char/sx.c	2005-02-07 16:32:20.000000000 +0200
+++ linux-2.6.11-rc3-mm/drivers/char/sx.c	2005-02-07 15:37:10.000000000 +0200
@@ -252,11 +252,13 @@
 #endif
 
 #ifdef CONFIG_PCI
+#ifdef MODULE
 static struct pci_device_id sx_pci_tbl[] = {
 	{ PCI_VENDOR_ID_SPECIALIX, PCI_DEVICE_ID_SPECIALIX_SX_XIO_IO8, PCI_ANY_ID, PCI_ANY_ID },
 	{ 0 }
 };
 MODULE_DEVICE_TABLE(pci, sx_pci_tbl);
+#endif
 #endif /* CONFIG_PCI */
 
 /* Configurable options: 




[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors