summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2008-07-25 19:44:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-26 12:00:02 -0700
commitc485b465a031b6f9b9a51300e0ee1f86efc6db87 (patch)
tree41c198953a1b2519322b67df4a315b2233998f9b
parent999ed65ad12e374d7445fbc13f5a1d146ae4b0da (diff)
downloadlinux-stable-c485b465a031b6f9b9a51300e0ee1f86efc6db87.tar.gz
linux-stable-c485b465a031b6f9b9a51300e0ee1f86efc6db87.tar.bz2
linux-stable-c485b465a031b6f9b9a51300e0ee1f86efc6db87.zip
pnp: fix the fcpnp_driver declaration to only exist if CONFIG_PNP=y
Fix the fcpnp_driver declaration to only exist if CONFIG_PNP=y as it's only accessed in that case. The PNP=n variant was added by 30d55e71a81b1f5a8136f191dc9f4c21f18e77e6 ("hisax: depend on CONFIG_PNP, not __ISAPNP__") Fixes an unused variable warning. Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Cc: Karsten Keil <kkeil@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/isdn/hisax/hisax_fcpcipnp.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c
index c0b4db2f8364..1925118122f8 100644
--- a/drivers/isdn/hisax/hisax_fcpcipnp.c
+++ b/drivers/isdn/hisax/hisax_fcpcipnp.c
@@ -974,8 +974,6 @@ static struct pnp_driver fcpnp_driver = {
.remove = __devexit_p(fcpnp_remove),
.id_table = fcpnp_ids,
};
-#else
-static struct pnp_driver fcpnp_driver;
#endif
static void __devexit fcpci_remove(struct pci_dev *pdev)