CVS Update@linux-mips.org: linux

[ppopov@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ppopov@ftp.linux-mips.org       05/09/16 00:42:27

Modified files:
        arch/mips/au1000/common: platform.c setup.c 
        drivers/pcmcia : au1000_generic.c 

Log message:
        - moved platform structure to platform.c
        - fixed an iounmap warning
        - export fixup_xx, needed by the module

diff -urN linux/arch/mips/au1000/common/platform.c 
linux/arch/mips/au1000/common/platform.c
--- linux/arch/mips/au1000/common/platform.c    2005/09/15 08:03:12     1.8
+++ linux/arch/mips/au1000/common/platform.c    2005/09/15 23:42:27     1.9
@@ -210,9 +210,15 @@
 
 #endif
 
+static struct platform_device au1x00_pcmcia_device = {
+       .name           = "au1x00-pcmcia",
+       .id             = 0,
+};
+
 
 static struct platform_device *au1xxx_platform_devices[] __initdata = {
        &au1xxx_usb_ohci_device,
+       &au1x00_pcmcia_device,
 #ifdef CONFIG_FB_AU1100
        &au1100_lcd_device,
 #endif
diff -urN linux/arch/mips/au1000/common/setup.c 
linux/arch/mips/au1000/common/setup.c
--- linux/arch/mips/au1000/common/setup.c       2005/07/11 10:03:23     1.25
+++ linux/arch/mips/au1000/common/setup.c       2005/09/15 23:42:27     1.26
@@ -32,6 +32,7 @@
 #include <linux/mm.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
+#include <linux/module.h>
 
 #include <asm/cpu.h>
 #include <asm/bootinfo.h>
@@ -186,4 +187,5 @@
        /* default nop */
        return phys_addr;
 }
+EXPORT_SYMBOL(__fixup_bigphys_addr);
 #endif
diff -urN linux/drivers/pcmcia/au1000_generic.c 
linux/drivers/pcmcia/au1000_generic.c
--- linux/drivers/pcmcia/au1000_generic.c       2005/08/23 22:27:52     1.23
+++ linux/drivers/pcmcia/au1000_generic.c       2005/09/15 23:42:27     1.24
@@ -491,7 +491,7 @@
                flush_scheduled_work();
                skt->ops->hw_shutdown(skt);
                au1x00_pcmcia_config_skt(skt, &dead_socket);
-               iounmap(skt->virt_io);
+               iounmap(skt->virt_io + (u32)mips_io_port_base);
                skt->virt_io = NULL;
        }
 
@@ -546,10 +546,6 @@
        .resume         = au1x00_drv_pcmcia_resume
 };
 
-static struct platform_device au1x00_device = {
-       .name = "au1x00-pcmcia",
-       .id = 0,
-};
 
 /* au1x00_pcmcia_init()
  *
@@ -563,7 +559,6 @@
        int error = 0;
        if ((error = driver_register(&au1x00_pcmcia_driver)))
                return error;
-       platform_device_register(&au1x00_device);
        return error;
 }
 
@@ -574,7 +569,6 @@
 static void __exit au1x00_pcmcia_exit(void)
 {
        driver_unregister(&au1x00_pcmcia_driver);
-       platform_device_unregister(&au1x00_device);
 }
 
 module_init(au1x00_pcmcia_init);