aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2008-04-28 05:14:41 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-28 11:58:34 -0400
commit30d55e71a81b1f5a8136f191dc9f4c21f18e77e6 (patch)
treeafe0df1855ae17e27b323888337dc2215464fc2d /drivers/isdn
parentf3429545d03a553c6a3e9fcf60ddea31819848ad (diff)
hisax: depend on CONFIG_PNP, not __ISAPNP__
The PNP driver interfaces depend on CONFIG_PNP, so test that rather than __ISAPNP__. Signed-off-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>
Diffstat (limited to 'drivers/isdn')
-rw-r--r--drivers/isdn/hisax/hisax_fcpcipnp.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c
index 539b2e0c8254..c0b4db2f8364 100644
--- a/drivers/isdn/hisax/hisax_fcpcipnp.c
+++ b/drivers/isdn/hisax/hisax_fcpcipnp.c
@@ -68,7 +68,7 @@ static struct pci_device_id fcpci_ids[] = {
68 68
69MODULE_DEVICE_TABLE(pci, fcpci_ids); 69MODULE_DEVICE_TABLE(pci, fcpci_ids);
70 70
71#ifdef __ISAPNP__ 71#ifdef CONFIG_PNP
72static struct pnp_device_id fcpnp_ids[] __devinitdata = { 72static struct pnp_device_id fcpnp_ids[] __devinitdata = {
73 { 73 {
74 .id = "AVM0900", 74 .id = "AVM0900",
@@ -914,7 +914,7 @@ static int __devinit fcpci_probe(struct pci_dev *pdev,
914 return retval; 914 return retval;
915} 915}
916 916
917#ifdef __ISAPNP__ 917#ifdef CONFIG_PNP
918static int __devinit fcpnp_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id) 918static int __devinit fcpnp_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
919{ 919{
920 struct fritz_adapter *adapter; 920 struct fritz_adapter *adapter;
@@ -974,6 +974,8 @@ static struct pnp_driver fcpnp_driver = {
974 .remove = __devexit_p(fcpnp_remove), 974 .remove = __devexit_p(fcpnp_remove),
975 .id_table = fcpnp_ids, 975 .id_table = fcpnp_ids,
976}; 976};
977#else
978static struct pnp_driver fcpnp_driver;
977#endif 979#endif
978 980
979static void __devexit fcpci_remove(struct pci_dev *pdev) 981static void __devexit fcpci_remove(struct pci_dev *pdev)
@@ -1001,7 +1003,7 @@ static int __init hisax_fcpcipnp_init(void)
1001 retval = pci_register_driver(&fcpci_driver); 1003 retval = pci_register_driver(&fcpci_driver);
1002 if (retval) 1004 if (retval)
1003 return retval; 1005 return retval;
1004#ifdef __ISAPNP__ 1006#ifdef CONFIG_PNP
1005 retval = pnp_register_driver(&fcpnp_driver); 1007 retval = pnp_register_driver(&fcpnp_driver);
1006 if (retval < 0) { 1008 if (retval < 0) {
1007 pci_unregister_driver(&fcpci_driver); 1009 pci_unregister_driver(&fcpci_driver);
@@ -1013,7 +1015,7 @@ static int __init hisax_fcpcipnp_init(void)
1013 1015
1014static void __exit hisax_fcpcipnp_exit(void) 1016static void __exit hisax_fcpcipnp_exit(void)
1015{ 1017{
1016#ifdef __ISAPNP__ 1018#ifdef CONFIG_PNP
1017 pnp_unregister_driver(&fcpnp_driver); 1019 pnp_unregister_driver(&fcpnp_driver);
1018#endif 1020#endif
1019 pci_unregister_driver(&fcpci_driver); 1021 pci_unregister_driver(&fcpci_driver);