diff options
author | Gabriel C <nix.or.die@googlemail.com> | 2007-10-02 17:38:02 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.localdomain> | 2007-10-12 14:54:47 -0400 |
commit | 2ca482302f2080e6861eaf753051ac35b6b411ad (patch) | |
tree | 9311029447d7bc8b243e901cb0123d0a0fbdd62a /drivers/scsi | |
parent | 89932697ce742c094916d8270c282042b24776b3 (diff) |
[SCSI] fdomain: fix CONFIG_PCI=n warnings
I get this warnings on current git when CONFIG_PCI is not set :
drivers/scsi/fdomain.c:390: warning: 'PCI_dev' defined but not used
drivers/scsi/fdomain.c:1768: warning: 'fdomain_pci_tbl' defined but not used
Signed-off-by: Gabriel Craciunescu <nix.or.die@googlemail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/fdomain.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c index 36169d597e98..5d282e6a6ae1 100644 --- a/drivers/scsi/fdomain.c +++ b/drivers/scsi/fdomain.c | |||
@@ -387,7 +387,9 @@ static void __iomem * bios_mem; | |||
387 | static int bios_major; | 387 | static int bios_major; |
388 | static int bios_minor; | 388 | static int bios_minor; |
389 | static int PCI_bus; | 389 | static int PCI_bus; |
390 | #ifdef CONFIG_PCI | ||
390 | static struct pci_dev *PCI_dev; | 391 | static struct pci_dev *PCI_dev; |
392 | #endif | ||
391 | static int Quantum; /* Quantum board variant */ | 393 | static int Quantum; /* Quantum board variant */ |
392 | static int interrupt_level; | 394 | static int interrupt_level; |
393 | static volatile int in_command; | 395 | static volatile int in_command; |
@@ -1764,6 +1766,7 @@ struct scsi_host_template fdomain_driver_template = { | |||
1764 | }; | 1766 | }; |
1765 | 1767 | ||
1766 | #ifndef PCMCIA | 1768 | #ifndef PCMCIA |
1769 | #ifdef CONFIG_PCI | ||
1767 | 1770 | ||
1768 | static struct pci_device_id fdomain_pci_tbl[] __devinitdata = { | 1771 | static struct pci_device_id fdomain_pci_tbl[] __devinitdata = { |
1769 | { PCI_VENDOR_ID_FD, PCI_DEVICE_ID_FD_36C70, | 1772 | { PCI_VENDOR_ID_FD, PCI_DEVICE_ID_FD_36C70, |
@@ -1771,7 +1774,7 @@ static struct pci_device_id fdomain_pci_tbl[] __devinitdata = { | |||
1771 | { } | 1774 | { } |
1772 | }; | 1775 | }; |
1773 | MODULE_DEVICE_TABLE(pci, fdomain_pci_tbl); | 1776 | MODULE_DEVICE_TABLE(pci, fdomain_pci_tbl); |
1774 | 1777 | #endif | |
1775 | #define driver_template fdomain_driver_template | 1778 | #define driver_template fdomain_driver_template |
1776 | #include "scsi_module.c" | 1779 | #include "scsi_module.c" |
1777 | 1780 | ||