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

[karo-tx-linux.git] / arch / arm / mach-omap1 / gpio15xx.c

diff --git a/arch/arm/mach-omap1/gpio15xx.c b/arch/arm/mach-omap1/gpio15xx.c
index f79c6aef11af5964386e3fe3b3391ac9318b841f..399da4ce017bfb39d9134e869002710da6f28e20 100644 (file)
--- a/arch/arm/mach-omap1/gpio15xx.c
+++ b/arch/arm/mach-omap1/gpio15xx.c
@@ -52,7 +52,7 @@ static struct __initdata omap_gpio_platform_data omap15xx_mpu_gpio_config = {
        .regs                   = &omap15xx_mpuio_regs,
 };
 
-static struct __initdata platform_device omap15xx_mpu_gpio = {
+static struct platform_device omap15xx_mpu_gpio = {
        .name           = "omap_gpio",
        .id             = 0,
        .dev            = {
@@ -92,7 +92,7 @@ static struct __initdata omap_gpio_platform_data omap15xx_gpio_config = {
        .regs                   = &omap15xx_gpio_regs,
 };
 
-static struct __initdata platform_device omap15xx_gpio = {
+static struct platform_device omap15xx_gpio = {
        .name           = "omap_gpio",
        .id             = 1,
        .dev            = {