patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / pcmcia / sa1100_generic.c

diff --git a/drivers/pcmcia/sa1100_generic.c b/drivers/pcmcia/sa1100_generic.c
index 8f34530..ceeed4f 100644 (file)
--- a/drivers/pcmcia/sa1100_generic.c
+++ b/drivers/pcmcia/sa1100_generic.c
@@ -43,7 +43,7 @@
 #include <pcmcia/cs.h>
 #include <pcmcia/ss.h>
 
-#include "sa1100.h"
+#include "sa1100_generic.h"
 
 static int (*sa11x0_pcmcia_hw_init[])(struct device *dev) = {
 #ifdef CONFIG_SA1100_ASSABET
@@ -118,7 +118,7 @@ static int sa11x0_drv_pcmcia_resume(struct device *dev, u32 level)
 
 static struct device_driver sa11x0_pcmcia_driver = {
        .probe          = sa11x0_drv_pcmcia_probe,
-       .remove         = sa11xx_drv_pcmcia_remove,
+       .remove         = soc_common_drv_pcmcia_remove,
        .name           = "sa11x0-pcmcia",
        .bus            = &platform_bus_type,
        .suspend        = sa11x0_drv_pcmcia_suspend,