Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / net / smc911x.c

diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index e2ee91a6ae7e063c8f302b0eaba1fd56eedc12ba..02e52be91004d73b313ae3b7ed27644dba354e00 100644 (file)
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -2123,7 +2123,7 @@ static int smc911x_drv_probe(struct platform_device *pdev)
                ret = -ENODEV;
                goto out;
        }
-
+#ifndef SMC_MEM_RESERVED
        /*
         * Request the regions.
         */
@@ -2131,7 +2131,7 @@ static int smc911x_drv_probe(struct platform_device *pdev)
                 ret = -EBUSY;
                 goto out;
        }
-
+#endif
        ndev = alloc_etherdev(sizeof(struct smc911x_local));
        if (!ndev) {
                printk("%s: could not allocate device.\n", CARDNAME);
@@ -2159,7 +2159,9 @@ static int smc911x_drv_probe(struct platform_device *pdev)
 release_both:
                free_netdev(ndev);
 release_1:
+#ifndef SMC_MEM_RESERVED
                release_mem_region(res->start, SMC911X_IO_EXTENT);
+#endif
 out:
                printk("%s: not found (%d).\n", CARDNAME, ret);
        }
@@ -2198,8 +2200,9 @@ static int smc911x_drv_remove(struct platform_device *pdev)
 #endif
        iounmap((void *)ndev->base_addr);
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+#ifndef SMC_MEM_RESERVED
        release_mem_region(res->start, SMC911X_IO_EXTENT);
-
+#endif
        free_netdev(ndev);
        return 0;
 }