Merge branch 'omap-all' into devel

Conflicts:

	arch/arm/mach-omap2/gpmc.c
	arch/arm/mach-omap2/irq.c
This commit is contained in:
Russell King
2008-10-14 22:24:42 +01:00
committed by Russell King
104 changed files with 10652 additions and 914 deletions

View File

@@ -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;