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

[pandora-kernel.git] / arch / arm / mach-omap1 / gpio7xx.c

diff --git a/arch/arm/mach-omap1/gpio7xx.c b/arch/arm/mach-omap1/gpio7xx.c
index d7f2ad3..5ab63ea 100644 (file)
--- a/arch/arm/mach-omap1/gpio7xx.c
+++ b/arch/arm/mach-omap1/gpio7xx.c
@@ -57,7 +57,7 @@ static struct __initdata omap_gpio_platform_data omap7xx_mpu_gpio_config = {
        .regs                   = &omap7xx_mpuio_regs,
 };
 
-static struct __initdata platform_device omap7xx_mpu_gpio = {
+static struct platform_device omap7xx_mpu_gpio = {
        .name           = "omap_gpio",
        .id             = 0,
        .dev            = {
@@ -97,7 +97,7 @@ static struct __initdata omap_gpio_platform_data omap7xx_gpio1_config = {
        .regs                   = &omap7xx_gpio_regs,
 };
 
-static struct __initdata platform_device omap7xx_gpio1 = {
+static struct platform_device omap7xx_gpio1 = {
        .name           = "omap_gpio",
        .id             = 1,
        .dev            = {
@@ -127,7 +127,7 @@ static struct __initdata omap_gpio_platform_data omap7xx_gpio2_config = {
        .regs                   = &omap7xx_gpio_regs,
 };
 
-static struct __initdata platform_device omap7xx_gpio2 = {
+static struct platform_device omap7xx_gpio2 = {
        .name           = "omap_gpio",
        .id             = 2,
        .dev            = {
@@ -157,7 +157,7 @@ static struct __initdata omap_gpio_platform_data omap7xx_gpio3_config = {
        .regs                   = &omap7xx_gpio_regs,
 };
 
-static struct __initdata platform_device omap7xx_gpio3 = {
+static struct platform_device omap7xx_gpio3 = {
        .name           = "omap_gpio",
        .id             = 3,
        .dev            = {
@@ -187,7 +187,7 @@ static struct __initdata omap_gpio_platform_data omap7xx_gpio4_config = {
        .regs                   = &omap7xx_gpio_regs,
 };
 
-static struct __initdata platform_device omap7xx_gpio4 = {
+static struct platform_device omap7xx_gpio4 = {
        .name           = "omap_gpio",
        .id             = 4,
        .dev            = {
@@ -217,7 +217,7 @@ static struct __initdata omap_gpio_platform_data omap7xx_gpio5_config = {
        .regs                   = &omap7xx_gpio_regs,
 };
 
-static struct __initdata platform_device omap7xx_gpio5 = {
+static struct platform_device omap7xx_gpio5 = {
        .name           = "omap_gpio",
        .id             = 5,
        .dev            = {
@@ -247,7 +247,7 @@ static struct __initdata omap_gpio_platform_data omap7xx_gpio6_config = {
        .regs                   = &omap7xx_gpio_regs,
 };
 
-static struct __initdata platform_device omap7xx_gpio6 = {
+static struct platform_device omap7xx_gpio6 = {
        .name           = "omap_gpio",
        .id             = 6,
        .dev            = {