Ignore:
Timestamp:
2012-04-29T09:36:43+02:00 (4 years ago)
Author:
juhosg
Message:

adm5120: merge 3.3 patches

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/adm5120/files/arch/mips/include/asm/mach-adm5120/adm5120_platform.h

    r27162 r31511  
    2121#include <linux/mtd/partitions.h> 
    2222#include <linux/mtd/nand.h> 
    23 #include <linux/gpio_buttons.h> 
     23#include <linux/input.h> 
     24#include <linux/gpio_keys.h> 
    2425#include <linux/amba/bus.h> 
    2526#include <linux/amba/serial.h> 
     
    2930        void                    (*switch_bank)(unsigned); 
    3031        u32                     window_size; 
    31 #ifdef CONFIG_MTD_PARTITIONS 
    3232        unsigned int            nr_parts; 
    3333        struct mtd_partition    *parts; 
    34 #endif 
    3534}; 
    3635 
     
    6968extern void adm5120_add_device_switch(unsigned num_ports, u8 *vlan_map) __init; 
    7069extern void adm5120_add_device_gpio(u32 disable_mask) __init; 
    71 extern void adm5120_add_device_gpio_buttons(unsigned nbuttons, 
    72                                         struct gpio_button *buttons) __init; 
     70extern void adm5120_register_gpio_buttons(int id, 
     71                                          unsigned poll_interval, 
     72                                          unsigned nbuttons, 
     73                                          struct gpio_keys_button *buttons); 
    7374 
    7475#define GPIO_LED_DEF(g, n, t, a) {      \ 
Note: See TracChangeset for help on using the changeset viewer.