adm5120: merge 3.3 patches

[librecmc/librecmc.git] / target / linux / adm5120 / files / arch / mips / adm5120 / mikrotik / rb-1xx.h

diff --git a/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-1xx.h b/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-1xx.h
index 835110db5103a3e4ef621f95a806b3361d0ee4a4..05e68bd0a86ea28147677f8000ffe355462fda84 100644 (file)
--- a/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-1xx.h
+++ b/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-1xx.h
@@ -26,7 +26,7 @@
 #include <prom/routerboot.h>
 
 extern struct platform_nand_data rb1xx_nand_data __initdata;
-extern struct gpio_button rb1xx_gpio_buttons[] __initdata;
+extern struct gpio_keys_button rb1xx_gpio_buttons[] __initdata;
 
 extern void rb1xx_add_device_flash(void) __init;
 extern void rb1xx_add_device_nand(void) __init;