From 33b58d54db4a2f26b5c01e6be5eed5e82d95d06b Mon Sep 17 00:00:00 2001
From: Gabriel C <nix.or.die@googlemail.com>
Date: Tue, 2 Oct 2007 14:38:02 -0700
Subject: [PATCH] --- yaml --- r: 68982 b: refs/heads/master c:
 2ca482302f2080e6861eaf753051ac35b6b411ad h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/scsi/fdomain.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9e0281101608..dd041eb0ebaf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89932697ce742c094916d8270c282042b24776b3
+refs/heads/master: 2ca482302f2080e6861eaf753051ac35b6b411ad
diff --git a/trunk/drivers/scsi/fdomain.c b/trunk/drivers/scsi/fdomain.c
index 36169d597e98..5d282e6a6ae1 100644
--- a/trunk/drivers/scsi/fdomain.c
+++ b/trunk/drivers/scsi/fdomain.c
@@ -387,7 +387,9 @@ static void __iomem *    bios_mem;
 static int               bios_major;
 static int               bios_minor;
 static int               PCI_bus;
+#ifdef CONFIG_PCI
 static struct pci_dev	*PCI_dev;
+#endif
 static int               Quantum;	/* Quantum board variant */
 static int               interrupt_level;
 static volatile int      in_command;
@@ -1764,6 +1766,7 @@ struct scsi_host_template fdomain_driver_template = {
 };
 
 #ifndef PCMCIA
+#ifdef CONFIG_PCI
 
 static struct pci_device_id fdomain_pci_tbl[] __devinitdata = {
 	{ PCI_VENDOR_ID_FD, PCI_DEVICE_ID_FD_36C70,
@@ -1771,7 +1774,7 @@ static struct pci_device_id fdomain_pci_tbl[] __devinitdata = {
 	{ }
 };
 MODULE_DEVICE_TABLE(pci, fdomain_pci_tbl);
-
+#endif
 #define driver_template fdomain_driver_template
 #include "scsi_module.c"