summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs/mpc83xx_defconfig
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2017-08-23 07:37:21 +0200
committerMichael Ellerman <mpe@ellerman.id.au>2017-08-28 14:10:00 +0200
commit980b4503b9efd97bcb51d5508d82fbf3ccb6aadb (patch)
tree47cc9d7270281d4b8a499ff037cf6b21583f02d5 /arch/powerpc/configs/mpc83xx_defconfig
parentpowerpc/oops: Line up NIP & MSR with other rows (diff)
downloadlinux-980b4503b9efd97bcb51d5508d82fbf3ccb6aadb.tar.xz
linux-980b4503b9efd97bcb51d5508d82fbf3ccb6aadb.zip
powerpc/configs: Update for symbol movement only
Update defconfigs for symbols that have moved around, without their value changing. Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/configs/mpc83xx_defconfig')
-rw-r--r--arch/powerpc/configs/mpc83xx_defconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig
index 6574477fd726..d74b124e7b8c 100644
--- a/arch/powerpc/configs/mpc83xx_defconfig
+++ b/arch/powerpc/configs/mpc83xx_defconfig
@@ -21,7 +21,6 @@ CONFIG_MPC837x_MDS=y
CONFIG_MPC837x_RDB=y
CONFIG_SBC834x=y
CONFIG_ASP834x=y
-CONFIG_QUICC_ENGINE=y
CONFIG_QE_GPIO=y
CONFIG_MATH_EMULATION=y
CONFIG_PCI=y
@@ -60,10 +59,10 @@ CONFIG_SATA_SIL=y
CONFIG_NETDEVICES=y
CONFIG_UCC_GETH=y
CONFIG_GIANFAR=y
-CONFIG_MARVELL_PHY=y
CONFIG_DAVICOM_PHY=y
-CONFIG_VITESSE_PHY=y
CONFIG_ICPLUS_PHY=y
+CONFIG_MARVELL_PHY=y
+CONFIG_VITESSE_PHY=y
CONFIG_FIXED_PHY=y
CONFIG_INPUT_FF_MEMLESS=m
# CONFIG_INPUT_MOUSEDEV is not set
@@ -99,6 +98,7 @@ CONFIG_USB_EHCI_FSL=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_DS1307=y
CONFIG_RTC_DRV_DS1374=y
+CONFIG_QUICC_ENGINE=y
CONFIG_EXT2_FS=y
CONFIG_EXT4_FS=y
CONFIG_PROC_KCORE=y