Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[karo-tx-linux.git] / drivers / pcmcia / bfin_cf_pcmcia.c

diff --git a/drivers/pcmcia/bfin_cf_pcmcia.c b/drivers/pcmcia/bfin_cf_pcmcia.c
index 971991bab975a2ec0c91ab2724b9dd8c7f9cb90d..8b0923fd76c604322bd20fb482958a320e77ff36 100644 (file)
--- a/drivers/pcmcia/bfin_cf_pcmcia.c
+++ b/drivers/pcmcia/bfin_cf_pcmcia.c
@@ -36,10 +36,10 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/io.h>
+#include <linux/gpio.h>
 
 #include <pcmcia/ss.h>
 #include <pcmcia/cisreg.h>
-#include <asm/gpio.h>
 
 #define        SZ_1K   0x00000400
 #define        SZ_8K   0x00002000
@@ -304,7 +304,6 @@ static int bfin_cf_remove(struct platform_device *pdev)
 static struct platform_driver bfin_cf_driver = {
        .driver = {
                   .name = driver_name,
-                  .owner = THIS_MODULE,
                   },
        .probe = bfin_cf_probe,
        .remove = bfin_cf_remove,