From 0c2c450f2425592f2a19f3a6a2a4a36cf8ec406a Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Sun, 29 Apr 2012 07:36:43 +0000 Subject: adm5120: merge 3.3 patches git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31511 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../arch/mips/include/asm/mach-adm5120/adm5120_platform.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'target/linux/adm5120/files/arch/mips/include/asm/mach-adm5120/adm5120_platform.h') diff --git a/target/linux/adm5120/files/arch/mips/include/asm/mach-adm5120/adm5120_platform.h b/target/linux/adm5120/files/arch/mips/include/asm/mach-adm5120/adm5120_platform.h index 0159301d22..952c7adc8d 100644 --- a/target/linux/adm5120/files/arch/mips/include/asm/mach-adm5120/adm5120_platform.h +++ b/target/linux/adm5120/files/arch/mips/include/asm/mach-adm5120/adm5120_platform.h @@ -20,7 +20,8 @@ #include #include #include -#include +#include +#include #include #include @@ -28,10 +29,8 @@ struct adm5120_flash_platform_data { void (*set_vpp)(struct map_info *, int); void (*switch_bank)(unsigned); u32 window_size; -#ifdef CONFIG_MTD_PARTITIONS unsigned int nr_parts; struct mtd_partition *parts; -#endif }; struct adm5120_switch_platform_data { @@ -68,8 +67,10 @@ extern void adm5120_add_device_uart(unsigned id) __init; extern void adm5120_add_device_nand(struct platform_nand_data *pdata) __init; extern void adm5120_add_device_switch(unsigned num_ports, u8 *vlan_map) __init; extern void adm5120_add_device_gpio(u32 disable_mask) __init; -extern void adm5120_add_device_gpio_buttons(unsigned nbuttons, - struct gpio_button *buttons) __init; +extern void adm5120_register_gpio_buttons(int id, + unsigned poll_interval, + unsigned nbuttons, + struct gpio_keys_button *buttons); #define GPIO_LED_DEF(g, n, t, a) { \ .name = (n), \ -- cgit v1.2.3