Merge branch 'devel-gpio' into omap-for-linus

This commit is contained in:
Tony Lindgren
2010-12-10 11:37:47 -08:00
51 changed files with 2185 additions and 548 deletions

View File

@@ -490,7 +490,6 @@ static void __init omap3_beagle_init_irq(void)
#ifdef CONFIG_OMAP_32K_TIMER
omap2_gp_clockevent_set_gptimer(12);
#endif
omap_gpio_init();
}
static struct platform_device *omap3_beagle_devices[] __initdata = {