Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6

[linux-beck.git] / arch / arm / mach-omap1 / gpio16xx.c

diff --git a/arch/arm/mach-omap1/gpio16xx.c b/arch/arm/mach-omap1/gpio16xx.c
index c69b3b104286a72f7b54d60c2774f02470aa80d6..0f399bd0e70e7be70ee1eebc2603f8f877c63f4f 100644 (file)
--- a/arch/arm/mach-omap1/gpio16xx.c
+++ b/arch/arm/mach-omap1/gpio16xx.c
@@ -55,7 +55,7 @@ static struct __initdata omap_gpio_platform_data omap16xx_mpu_gpio_config = {
        .regs                   = &omap16xx_mpuio_regs,
 };
 
-static struct __initdata platform_device omap16xx_mpu_gpio = {
+static struct platform_device omap16xx_mpu_gpio = {
        .name           = "omap_gpio",
        .id             = 0,
        .dev            = {
@@ -98,7 +98,7 @@ static struct __initdata omap_gpio_platform_data omap16xx_gpio1_config = {
        .regs                   = &omap16xx_gpio_regs,
 };
 
-static struct __initdata platform_device omap16xx_gpio1 = {
+static struct platform_device omap16xx_gpio1 = {
        .name           = "omap_gpio",
        .id             = 1,
        .dev            = {
@@ -128,7 +128,7 @@ static struct __initdata omap_gpio_platform_data omap16xx_gpio2_config = {
        .regs                   = &omap16xx_gpio_regs,
 };
 
-static struct __initdata platform_device omap16xx_gpio2 = {
+static struct platform_device omap16xx_gpio2 = {
        .name           = "omap_gpio",
        .id             = 2,
        .dev            = {
@@ -158,7 +158,7 @@ static struct __initdata omap_gpio_platform_data omap16xx_gpio3_config = {
        .regs                   = &omap16xx_gpio_regs,
 };
 
-static struct __initdata platform_device omap16xx_gpio3 = {
+static struct platform_device omap16xx_gpio3 = {
        .name           = "omap_gpio",
        .id             = 3,
        .dev            = {
@@ -188,7 +188,7 @@ static struct __initdata omap_gpio_platform_data omap16xx_gpio4_config = {
        .regs                   = &omap16xx_gpio_regs,
 };
 
-static struct __initdata platform_device omap16xx_gpio4 = {
+static struct platform_device omap16xx_gpio4 = {
        .name           = "omap_gpio",
        .id             = 4,
        .dev            = {