diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-07-03 08:38:17 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-07-03 08:38:17 +0200 |
| commit | 18ea2863bf76d6cd81c83706b5eb180dc5ad23bc (patch) | |
| tree | ae51ca9e03b538a58c576e1fa79983ec31e22269 /arch/arm/configs/phytec-phycard-omap3_defconfig | |
| parent | c408a4ecbee60a9d512930972c09c6f9e365a671 (diff) | |
| parent | 893f30f614da5ed132265f5c4da767ec26a8edf5 (diff) | |
| download | barebox-18ea2863bf76d6cd81c83706b5eb180dc5ad23bc.tar.gz barebox-18ea2863bf76d6cd81c83706b5eb180dc5ad23bc.tar.xz | |
Merge branch 'for-next/omap'
Conflicts:
arch/arm/boards/beagle/board.c
Diffstat (limited to 'arch/arm/configs/phytec-phycard-omap3_defconfig')
| -rw-r--r-- | arch/arm/configs/phytec-phycard-omap3_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/phytec-phycard-omap3_defconfig b/arch/arm/configs/phytec-phycard-omap3_defconfig index a2564d4459..5865ebd8b9 100644 --- a/arch/arm/configs/phytec-phycard-omap3_defconfig +++ b/arch/arm/configs/phytec-phycard-omap3_defconfig @@ -7,7 +7,6 @@ CONFIG_CPU_V7=y CONFIG_CPU_32v7=y CONFIG_ARCH_OMAP3=y CONFIG_OMAP_CLOCK_SOURCE_S32K=y -CONFIG_OMAP3_CLOCK_CONFIG=y CONFIG_OMAP3_COPY_CLOCK_SRAM=n CONFIG_OMAP_GPMC=y CONFIG_MACH_PCAAL1=y |