summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-05-21 14:42:01 -0700
committerOlof Johansson <olof@lixom.net>2014-05-21 14:42:01 -0700
commit6ad8f98d227f75274daf8fa2ca1e014530b60a72 (patch)
tree885c88bcc8f671b66cafbcd14ac09be4fa8bc88b /arch/arm/configs
parent0db6542dd41396a06657cd69626f00e0695e3cd1 (diff)
parent5659e3bcbcb5d454fa183351362e852321784f7c (diff)
downloadop-kernel-dev-6ad8f98d227f75274daf8fa2ca1e014530b60a72.zip
op-kernel-dev-6ad8f98d227f75274daf8fa2ca1e014530b60a72.tar.gz
Merge tag 'sunxi-defconfig-for-3.16' of https://github.com/mripard/linux into next/boards
Merge "Allwinner defconfig additions for 3.16" from Maxime Ripard. * tag 'sunxi-defconfig-for-3.16' of https://github.com/mripard/linux: ARM: sunxi: drop CONFIG_COMMON_CLK_DEBUG Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/sunxi_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig
index b5df4a5..28287ae 100644
--- a/arch/arm/configs/sunxi_defconfig
+++ b/arch/arm/configs/sunxi_defconfig
@@ -62,7 +62,6 @@ CONFIG_LEDS_GPIO=y
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-CONFIG_COMMON_CLK_DEBUG=y
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_TMPFS=y
CONFIG_NFS_FS=y
OpenPOWER on IntegriCloud