summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Knutsson2005-11-22 06:32:03 +0100
committerLinus Torvalds2005-11-22 18:13:41 +0100
commit18317ab0ca5ac0c654be3eac31ebb781b4a5e9b2 (patch)
treed92ae6722f6f18014f8c27b2d03080213f915ea3
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/scj... (diff)
downloadkernel-qcow2-linux-18317ab0ca5ac0c654be3eac31ebb781b4a5e9b2.tar.gz
kernel-qcow2-linux-18317ab0ca5ac0c654be3eac31ebb781b4a5e9b2.tar.xz
kernel-qcow2-linux-18317ab0ca5ac0c654be3eac31ebb781b4a5e9b2.zip
[PATCH] net: Fix compiler-error on dgrs.c when !CONFIG_PCI
drivers/net/dgrs.c: In function `dgrs_init_module': drivers/net/dgrs.c:1598: `dgrs_pci_driver' undeclared (first use in this function) Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/net/dgrs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/dgrs.c b/drivers/net/dgrs.c
index 2a290cc397ad..70b47e4c4e9c 100644
--- a/drivers/net/dgrs.c
+++ b/drivers/net/dgrs.c
@@ -1458,6 +1458,8 @@ static struct pci_driver dgrs_pci_driver = {
.probe = dgrs_pci_probe,
.remove = __devexit_p(dgrs_pci_remove),
};
+#else
+static struct pci_driver dgrs_pci_driver = {};
#endif