Merge branch 'omap-all' into devel
Conflicts: arch/arm/mach-omap2/gpmc.c arch/arm/mach-omap2/irq.c
This commit is contained in:
@@ -62,7 +62,7 @@ struct omap_kp {
|
||||
unsigned int debounce;
|
||||
};
|
||||
|
||||
DECLARE_TASKLET_DISABLED(kp_tasklet, omap_kp_tasklet, 0);
|
||||
static DECLARE_TASKLET_DISABLED(kp_tasklet, omap_kp_tasklet, 0);
|
||||
|
||||
static int *keymap;
|
||||
static unsigned int *row_gpios;
|
||||
|
Reference in New Issue
Block a user