diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-23 15:57:31 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-23 15:57:31 -0400 |
| commit | a2ab67fae1ab9226679495a8d260f4e6555efc5f (patch) | |
| tree | f7de683c9c8ff0869a7e11f1d40802145d05f5b4 /arch/arm/mach-omap2/board-omap3beagle.c | |
| parent | 6d0485a99366d4e0e7e725f14995c74cb7ca4499 (diff) | |
| parent | 135cad366b4e7d6a79f6369f6cb5b721985aa62f (diff) | |
Merge branch 'for-rmk-devel' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3beagle.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3beagle.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 744740ae1b9c..3a7a29d1f9a7 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c | |||
| @@ -42,6 +42,7 @@ | |||
| 42 | #include <mach/nand.h> | 42 | #include <mach/nand.h> |
| 43 | #include <mach/mux.h> | 43 | #include <mach/mux.h> |
| 44 | #include <mach/usb.h> | 44 | #include <mach/usb.h> |
| 45 | #include <mach/timer-gp.h> | ||
| 45 | 46 | ||
| 46 | #include "mmc-twl4030.h" | 47 | #include "mmc-twl4030.h" |
| 47 | 48 | ||
| @@ -186,6 +187,9 @@ static void __init omap3_beagle_init_irq(void) | |||
| 186 | { | 187 | { |
| 187 | omap2_init_common_hw(NULL); | 188 | omap2_init_common_hw(NULL); |
| 188 | omap_init_irq(); | 189 | omap_init_irq(); |
| 190 | #ifdef CONFIG_OMAP_32K_TIMER | ||
| 191 | omap2_gp_clockevent_set_gptimer(12); | ||
| 192 | #endif | ||
| 189 | omap_gpio_init(); | 193 | omap_gpio_init(); |
| 190 | } | 194 | } |
| 191 | 195 | ||