summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/sunxi_defconfig
diff options
context:
space:
mode:
authorTimo Sigurdsson <public_timo.s@silentcreek.de>2015-11-20 02:46:19 +0100
committerMaxime Ripard <maxime.ripard@free-electrons.com>2015-11-20 12:48:13 +0100
commit263350adb2235dbe7d38763812a9b05ab56795bc (patch)
tree259061078edb98ea090c1aac54c8f98441e64500 /arch/arm/configs/sunxi_defconfig
parentARM: sunxi: Really enable LRADC keys in sunxi_defconfig (diff)
downloadlinux-263350adb2235dbe7d38763812a9b05ab56795bc.tar.xz
linux-263350adb2235dbe7d38763812a9b05ab56795bc.zip
ARM: sunxi: Clean up sunxi_defconfig
Clean up sunxi_defconfig by generating a fresh file via make sunxi_defconfig make savedefconfig While this moves around a few lines and removes unnecessary symbols, it doesn't introduce any functional changes. The resulting .config is identical before and after this patch. Signed-off-by: Timo Sigurdsson <public_timo.s@silentcreek.de> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'arch/arm/configs/sunxi_defconfig')
-rw-r--r--arch/arm/configs/sunxi_defconfig8
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig
index 2a3641cd1351..50270cc95ccb 100644
--- a/arch/arm/configs/sunxi_defconfig
+++ b/arch/arm/configs/sunxi_defconfig
@@ -11,14 +11,12 @@ CONFIG_SMP=y
CONFIG_NR_CPUS=8
CONFIG_AEABI=y
CONFIG_HIGHMEM=y
-CONFIG_HIGHPTE=y
CONFIG_ARM_APPENDED_DTB=y
CONFIG_ARM_ATAG_DTB_COMPAT=y
CONFIG_CPU_FREQ=y
CONFIG_CPUFREQ_DT=y
CONFIG_VFP=y
CONFIG_NEON=y
-CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
@@ -60,12 +58,12 @@ CONFIG_STMMAC_ETH=y
# CONFIG_NET_VENDOR_WIZNET is not set
# CONFIG_WLAN is not set
# CONFIG_INPUT_MOUSEDEV is not set
+CONFIG_KEYBOARD_SUN4I_LRADC=y
# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_AXP20X_PEK=y
CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_KEYBOARD_SUN4I_LRADC=y
CONFIG_TOUCHSCREEN_SUN4I=y
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AXP20X_PEK=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_NR_UARTS=8