renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-11-19 16:14:13 +08:00
Code

hisax: depend on CONFIG_PNP, not __ISAPNP__

Browse Source 
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>
This commit is contained in:
Bjorn Helgaas 2008-04-28 02:14:41 -07:00 committed by Linus Torvalds
parent f3429545d0
commit 30d55e71a8
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/isdn/hisax/hisax_fcpcipnp.c
View File

@ -68,7 +68,7 @@ static struct pci_device_id fcpci_ids[] = {
MODULE_DEVICE_TABLE(pci, fcpci_ids); MODULE_DEVICE_TABLE(pci, fcpci_ids);
#ifdef __ISAPNP__ #ifdef CONFIG_PNP
static struct pnp_device_id fcpnp_ids[] __devinitdata = { static struct pnp_device_id fcpnp_ids[] __devinitdata = {
{ {
.id = "AVM0900", .id = "AVM0900",
@ -914,7 +914,7 @@ static int __devinit fcpci_probe(struct pci_dev *pdev,
return retval; return retval;
} }
#ifdef __ISAPNP__ #ifdef CONFIG_PNP
static int __devinit fcpnp_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id) static int __devinit fcpnp_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
{ {
struct fritz_adapter *adapter; struct fritz_adapter *adapter;
@ -974,6 +974,8 @@ static struct pnp_driver fcpnp_driver = {
.remove = __devexit_p(fcpnp_remove), .remove = __devexit_p(fcpnp_remove),
.id_table = fcpnp_ids, .id_table = fcpnp_ids,
}; };
#else
static struct pnp_driver fcpnp_driver;
#endif #endif
static void __devexit fcpci_remove(struct pci_dev *pdev) static void __devexit fcpci_remove(struct pci_dev *pdev)
@ -1001,7 +1003,7 @@ static int __init hisax_fcpcipnp_init(void)
retval = pci_register_driver(&fcpci_driver); retval = pci_register_driver(&fcpci_driver);
if (retval) if (retval)
return retval; return retval;
#ifdef __ISAPNP__ #ifdef CONFIG_PNP
retval = pnp_register_driver(&fcpnp_driver); retval = pnp_register_driver(&fcpnp_driver);
if (retval < 0) { if (retval < 0) {
pci_unregister_driver(&fcpci_driver); pci_unregister_driver(&fcpci_driver);
@ -1013,7 +1015,7 @@ static int __init hisax_fcpcipnp_init(void)
static void __exit hisax_fcpcipnp_exit(void) static void __exit hisax_fcpcipnp_exit(void)
{ {
#ifdef __ISAPNP__ #ifdef CONFIG_PNP
pnp_unregister_driver(&fcpnp_driver); pnp_unregister_driver(&fcpnp_driver);
#endif #endif
pci_unregister_driver(&fcpci_driver); pci_unregister_driver(&fcpci_driver);