From: David Howells <dhowells@redhat.com>
Date: Sat, 26 Jul 2008 02:44:47 +0000 (-0700)
Subject: pnp: fix the fcpnp_driver declaration to only exist if CONFIG_PNP=y
X-Git-Tag: v2.6.27-rc1~198
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c485b465a031b6f9b9a51300e0ee1f86efc6db87;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c
index c0b4db2f836..1925118122f 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)