diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-21 23:42:01 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-21 23:42:01 +0200 |
| commit | 6ad8f98d227f75274daf8fa2ca1e014530b60a72 (patch) | |
| tree | 885c88bcc8f671b66cafbcd14ac09be4fa8bc88b /arch/arm | |
| parent | Merge tag 'renesas-r7s72100-ccf-for-v3.16' of git://git.kernel.org/pub/scm/li... (diff) | |
| parent | ARM: sunxi: drop CONFIG_COMMON_CLK_DEBUG (diff) | |
| download | linux-6ad8f98d227f75274daf8fa2ca1e014530b60a72.tar.xz linux-6ad8f98d227f75274daf8fa2ca1e014530b60a72.zip | |
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')
| -rw-r--r-- | arch/arm/configs/sunxi_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig index b5df4a511b0a..28287aebdc15 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 |