Merge branch 'master' into devel

This commit is contained in:
Russell King
2009-09-12 12:04:37 +01:00
committed by Russell King
908 changed files with 12595 additions and 7118 deletions

View File

@@ -59,7 +59,7 @@ static void __init gic_init_irq(void)
static void __init omap_4430sdp_init_irq(void)
{
omap2_init_common_hw(NULL);
omap2_init_common_hw(NULL, NULL);
#ifdef CONFIG_OMAP_32K_TIMER
omap2_gp_clockevent_set_gptimer(1);
#endif