]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
pnp: fix the fcpnp_driver declaration to only exist if CONFIG_PNP=y
authorDavid Howells <dhowells@redhat.com>
Sat, 26 Jul 2008 02:44:47 +0000 (19:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Jul 2008 19:00:02 +0000 (12:00 -0700)
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>
drivers/isdn/hisax/hisax_fcpcipnp.c

index c0b4db2f8364cf186f25f2861bf41af59d411e49..1925118122f877bdb2313d64f7fc8478e678e141 100644 (file)
@@ -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)