Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[linux-2.6-omap-h63xx.git] / drivers / isdn / hisax / hisax_fcpcipnp.c

diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c
index 76043dedba5b442bc0e66e70a59bb1772a63400d..1925118122f877bdb2313d64f7fc8478e678e141 100644 (file)
--- 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[] = {
 
 MODULE_DEVICE_TABLE(pci, fcpci_ids);
 
-#ifdef __ISAPNP__
+#ifdef CONFIG_PNP
 static struct pnp_device_id fcpnp_ids[] __devinitdata = {
        { 
                .id             = "AVM0900",
@@ -914,7 +914,7 @@ static int __devinit fcpci_probe(struct pci_dev *pdev,
        return retval;
 }
 
-#ifdef __ISAPNP__
+#ifdef CONFIG_PNP
 static int __devinit fcpnp_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
 {
        struct fritz_adapter *adapter;
@@ -935,7 +935,7 @@ static int __devinit fcpnp_probe(struct pnp_dev *pdev, const struct pnp_device_i
        pnp_disable_dev(pdev);
        retval = pnp_activate_dev(pdev);
        if (retval < 0) {
-               printk(KERN_WARNING "%s: pnp_activate_dev(%s) ret(%d)\n", __FUNCTION__,
+               printk(KERN_WARNING "%s: pnp_activate_dev(%s) ret(%d)\n", __func__,
                        (char *)dev_id->driver_data, retval);
                goto err_free;
        }
@@ -1001,7 +1001,7 @@ static int __init hisax_fcpcipnp_init(void)
        retval = pci_register_driver(&fcpci_driver);
        if (retval)
                return retval;
-#ifdef __ISAPNP__
+#ifdef CONFIG_PNP
        retval = pnp_register_driver(&fcpnp_driver);
        if (retval < 0) {
                pci_unregister_driver(&fcpci_driver);
@@ -1013,7 +1013,7 @@ static int __init hisax_fcpcipnp_init(void)
 
 static void __exit hisax_fcpcipnp_exit(void)
 {
-#ifdef __ISAPNP__
+#ifdef CONFIG_PNP
        pnp_unregister_driver(&fcpnp_driver);
 #endif
        pci_unregister_driver(&fcpci_driver);