diff options
| author | Olof Johansson <olof@lixom.net> | 2015-08-06 10:11:36 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-08-06 10:11:36 +0200 |
| commit | 58e00a6c92d41e302880cae71b0f94b7a4d40c5d (patch) | |
| tree | d1b00b8e9385246605771090fee8ee539ee32d23 /arch/arm/mach-omap2/Kconfig | |
| parent | Merge tag 'renesas-marzen-board-removal-for-v4.3' of git://git.kernel.org/pub... (diff) | |
| parent | ARM: ux500: add an SMP enablement type and move cpu nodes (diff) | |
| download | linux-58e00a6c92d41e302880cae71b0f94b7a4d40c5d.tar.xz linux-58e00a6c92d41e302880cae71b0f94b7a4d40c5d.zip | |
Merge branch 'fixes' into next/cleanup
* fixes: (28 commits)
ARM: ux500: add an SMP enablement type and move cpu nodes
ARM: dts: keystone: fix dt bindings to use post div register for mainpll
ARM: nomadik: disable UART0 on Nomadik boards
ARM: dts: i.MX35: Fix can support.
ARM: OMAP2+: hwmod: Fix _wait_target_ready() for hwmods without sysc
ARM: dts: add CPU OPP and regulator supply property for exynos4210
ARM: dts: Update video-phy node with syscon phandle for exynos3250
ARM: keystone: dts: rename pcie nodes to help override status
ARM: keystone: dts: fix dt bindings for PCIe
ARM: pxa: fix dm9000 platform data regression
ARM: DRA7: hwmod: fix gpmc hwmod
ARM: dts: Correct audio input route & set mic bias for am335x-pepper
ARM: OMAP2+: Add HAVE_ARM_SCU for AM43XX
MAINTAINERS: digicolor: add dts files
ARM: ux500: fix MMC/SD card regression
ARM: ux500: define serial port aliases
ARM: dts: OMAP5: Add #iommu-cells property to IOMMUs
ARM: dts: OMAP4: Add #iommu-cells property to IOMMUs
ARM: dts: Fix frequency scaling on Gumstix Pepper
ARM: dts: configure regulators for Gumstix Pepper
...
Diffstat (limited to 'arch/arm/mach-omap2/Kconfig')
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index e68ad9f6a51e..9e2a68456b81 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -60,6 +60,7 @@ config SOC_AM43XX select ARM_GIC select MACH_OMAP_GENERIC select MIGHT_HAVE_CACHE_L2X0 + select HAVE_ARM_SCU config SOC_DRA7XX bool "TI DRA7XX" |