pcmcia: dev_node removal (core)

[safe/jmp/linux-2.6] / drivers / pcmcia / electra_cf.c

diff --git a/drivers/pcmcia/electra_cf.c b/drivers/pcmcia/electra_cf.c
index 52d0aa8..2e59fe9 100644 (file)
--- a/drivers/pcmcia/electra_cf.c
+++ b/drivers/pcmcia/electra_cf.c
@@ -28,10 +28,12 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
+#include <linux/mm.h>
 #include <linux/vmalloc.h>
+#include <linux/of_platform.h>
+#include <linux/slab.h>
 
 #include <pcmcia/ss.h>
-#include <asm/of_platform.h>
 
 static const char driver_name[] = "electra-cf";
 
@@ -296,7 +298,7 @@ static int __devinit electra_cf_probe(struct of_device *ofdev,
                goto fail3;
        }
 
-       dev_info(device, "at mem 0x%lx io 0x%lx irq %d\n",
+       dev_info(device, "at mem 0x%lx io 0x%llx irq %d\n",
                 cf->mem_phys, io.start, cf->irq);
 
        cf->active = 1;
@@ -346,7 +348,7 @@ static int __devexit electra_cf_remove(struct of_device *ofdev)
        return 0;
 }
 
-static struct of_device_id electra_cf_match[] = {
+static const struct of_device_id electra_cf_match[] = {
        {
                .compatible   = "electra-cf",
        },