diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-16 23:12:26 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-16 23:13:04 -0400 |
| commit | f4936639bc4a75218b5598ff69c52b9a8dd7f23d (patch) | |
| tree | 9c08fc81cb3d3e658ca7f8dc20a949496d9e6130 /arch/arm/plat-omap/Kconfig | |
| parent | d1226e8f98f130918265fb5b4dddcb60b783eb34 (diff) | |
| parent | 11964f53eb4d9ce59a058be9999d9cfcb1ced878 (diff) | |
Merge tag 'omap-devel-am33xx-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
From Tony Lindgren:
From Paul Walmsley <paul@pwsan.com>:
AM33xx hwmod data and miscellaneous clock and hwmod fixes. AM33xx
should now boot on mainline after this is applied, according to
Vaibhav.
(The shortlog makes no sense here since it contains mostly the dependent
cleanups that are part of the preceding branches).
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/plat-omap/Kconfig')
| -rw-r--r-- | arch/arm/plat-omap/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig index dd36eba9506c..d15a4a6d6146 100644 --- a/arch/arm/plat-omap/Kconfig +++ b/arch/arm/plat-omap/Kconfig | |||
| @@ -25,6 +25,7 @@ config ARCH_OMAP2PLUS | |||
| 25 | bool "TI OMAP2/3/4" | 25 | bool "TI OMAP2/3/4" |
| 26 | select CLKDEV_LOOKUP | 26 | select CLKDEV_LOOKUP |
| 27 | select GENERIC_IRQ_CHIP | 27 | select GENERIC_IRQ_CHIP |
| 28 | select SPARSE_IRQ | ||
| 28 | select OMAP_DM_TIMER | 29 | select OMAP_DM_TIMER |
| 29 | select USE_OF | 30 | select USE_OF |
| 30 | select PROC_DEVICETREE if PROC_FS | 31 | select PROC_DEVICETREE if PROC_FS |