]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ARM: davinci_all_defconfig: cleanup with savedefconfig
authorSekhar Nori <nsekhar@ti.com>
Thu, 18 May 2017 11:01:30 +0000 (16:31 +0530)
committerSekhar Nori <nsekhar@ti.com>
Mon, 22 May 2017 10:56:41 +0000 (16:26 +0530)
davinci_all_defconfig is out of sync with savedefconfig in some places.
Regenerate the default settings by:

$ make davinci_all_config
$ make savedefconfig
$ cp defconfig arch/arm/configs/davinci_all_defconfig

Signed-off-by: Sekhar Nori <nsekhar@ti.com>
arch/arm/configs/davinci_all_defconfig

index 88575865c2410b25a17904bc4920ee73e40de3bc..3d23356e2ebe77f66f57732e602eacd45961330a 100644 (file)
@@ -83,14 +83,13 @@ CONFIG_NETCONSOLE=y
 CONFIG_TUN=m
 CONFIG_DM9000=y
 CONFIG_TI_DAVINCI_EMAC=y
+CONFIG_LSI_ET1011C_PHY=y
 CONFIG_LXT_PHY=y
 CONFIG_SMSC_PHY=y
-CONFIG_LSI_ET1011C_PHY=y
 CONFIG_PPP=m
 CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_ASYNC=m
 CONFIG_PPP_SYNC_TTY=m
-# CONFIG_INPUT_MOUSEDEV is not set
 CONFIG_INPUT_EVDEV=m
 CONFIG_INPUT_EVBUG=m
 CONFIG_KEYBOARD_ATKBD=m
@@ -237,7 +236,6 @@ CONFIG_NLS_ASCII=m
 CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_UTF8=m
 CONFIG_DEBUG_FS=y
-CONFIG_TIMER_STATS=y
 CONFIG_DEBUG_RT_MUTEXES=y
 CONFIG_DEBUG_MUTEXES=y
 # CONFIG_ARM_UNWIND is not set