summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-11-24 15:56:03 +0000
committerArnd Bergmann <arnd@arndb.de>2011-11-24 15:56:03 +0000
commitb70c4207821f3f895e1c4c368aa0bece9141e524 (patch)
treed5644c819d3773691a1be3f33a6cf6bc34a25b0c /arch/arm/configs
parent597b97cab66da331ae9e19e728601e62542a7ca8 (diff)
parent52f3a41e0aca5625fbd118ed57a4debb25817e99 (diff)
downloadblackbird-op-linux-b70c4207821f3f895e1c4c368aa0bece9141e524.tar.gz
blackbird-op-linux-b70c4207821f3f895e1c4c368aa0bece9141e524.zip
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/omap1_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/omap1_defconfig b/arch/arm/configs/omap1_defconfig
index 7b63462b349d..a7e777581378 100644
--- a/arch/arm/configs/omap1_defconfig
+++ b/arch/arm/configs/omap1_defconfig
@@ -48,7 +48,6 @@ CONFIG_MACH_SX1=y
CONFIG_MACH_NOKIA770=y
CONFIG_MACH_AMS_DELTA=y
CONFIG_MACH_OMAP_GENERIC=y
-CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER=y
CONFIG_OMAP_ARM_216MHZ=y
CONFIG_OMAP_ARM_195MHZ=y
CONFIG_OMAP_ARM_192MHZ=y
OpenPOWER on IntegriCloud