diff options
Diffstat (limited to 'arch/arm/mach-pxa/pxa27x.c')
| -rw-r--r-- | arch/arm/mach-pxa/pxa27x.c | 7 | 
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index 3203a9f5b4a..301471a07a1 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c @@ -237,7 +237,7 @@ static struct clk_lookup pxa27x_clkregs[] = {  	INIT_CLKREG(&clk_pxa27x_im, NULL, "IMCLK"),  	INIT_CLKREG(&clk_pxa27x_memc, NULL, "MEMCLK"),  	INIT_CLKREG(&clk_pxa27x_mem, "pxa2xx-pcmcia", NULL), -	INIT_CLKREG(&clk_dummy, "pxa-gpio", NULL), +	INIT_CLKREG(&clk_dummy, "pxa27x-gpio", NULL),  	INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),  }; @@ -431,7 +431,8 @@ void __init pxa27x_set_i2c_power_info(struct i2c_pxa_platform_data *info)  }  static struct pxa_gpio_platform_data pxa27x_gpio_info __initdata = { -	.gpio_set_wake = gpio_set_wake, +	.irq_base	= PXA_GPIO_TO_IRQ(0), +	.gpio_set_wake	= gpio_set_wake,  };  static struct platform_device *devices[] __initdata = { @@ -470,7 +471,7 @@ static int __init pxa27x_init(void)  		register_syscore_ops(&pxa2xx_mfp_syscore_ops);  		register_syscore_ops(&pxa2xx_clock_syscore_ops); -		pxa_register_device(&pxa_device_gpio, &pxa27x_gpio_info); +		pxa_register_device(&pxa27x_device_gpio, &pxa27x_gpio_info);  		ret = platform_add_devices(devices, ARRAY_SIZE(devices));  	}  |