The patch titled
SCSI: advansys, wrap PCI table inside ifdef CONFIG_PCI
has been removed from the -mm tree. Its filename was
scsi-advansys-wrap-pci-table-inside-ifdef-config_pci.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: SCSI: advansys, wrap PCI table inside ifdef CONFIG_PCI
From: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
The Advansys ISA/EISA/PCI driver has a compile error when CONFIG_PCI=n, so
wrap the pci_device_id table inside ifdef CONFIG_PCI.
drivers/scsi/advansys.c: At top level:
drivers/scsi/advansys.c:18219: error: array type has incomplete element type
drivers/scsi/advansys.c:18221: error: 'PCI_ANY_ID' undeclared here (not in a function)
make[2]: *** [drivers/scsi/advansys.o] Error 1
make[1]: *** [drivers/scsi] Error 2
make: *** [drivers] Error 2
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Cc: <bobf@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/scsi/advansys.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletion(-)
diff -puN drivers/scsi/advansys.c~scsi-advansys-wrap-pci-table-inside-ifdef-config_pci drivers/scsi/advansys.c
--- a/drivers/scsi/advansys.c~scsi-advansys-wrap-pci-table-inside-ifdef-config_pci
+++ a/drivers/scsi/advansys.c
@@ -18133,6 +18133,7 @@ AdvInquiryHandling(
}
MODULE_LICENSE("Dual BSD/GPL");
+#ifdef CONFIG_PCI
/* PCI Devices supported by this driver */
static struct pci_device_id advansys_pci_tbl[] __devinitdata = {
{ PCI_VENDOR_ID_ASP, PCI_DEVICE_ID_ASP_1200A,
@@ -18150,4 +18151,4 @@ static struct pci_device_id advansys_pci
{ }
};
MODULE_DEVICE_TABLE(pci, advansys_pci_tbl);
-
+#endif /* CONFIG_PCI */
_
Patches currently in -mm which might be from randy.dunlap@xxxxxxxxxx are
origin.patch
git-alsa.patch
qconf-immediately-update-integer-and-string-values-in-xconfig-display.patch
git-mtd.patch
parisc-fix-module_param-iommu-permission.patch
git-scsi-rc-fixes.patch
reiser4-use-null-for-pointers.patch
extend-notifier_call_chain-to-count-nr_calls-made-fixes.patch
profile_likely-export-do_check_likely.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
