aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/configs/mpc85xx_defconfig8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig
index cf815e847cdc..e12146fda278 100644
--- a/arch/powerpc/configs/mpc85xx_defconfig
+++ b/arch/powerpc/configs/mpc85xx_defconfig
@@ -1,13 +1,12 @@
1CONFIG_PPC_85xx=y 1CONFIG_PPC_85xx=y
2CONFIG_PHYS_64BIT=y 2CONFIG_PHYS_64BIT=y
3CONFIG_EXPERIMENTAL=y
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
5CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
6CONFIG_BSD_PROCESS_ACCT=y
7CONFIG_AUDIT=y 5CONFIG_AUDIT=y
8CONFIG_IRQ_DOMAIN_DEBUG=y 6CONFIG_IRQ_DOMAIN_DEBUG=y
9CONFIG_NO_HZ=y 7CONFIG_NO_HZ=y
10CONFIG_HIGH_RES_TIMERS=y 8CONFIG_HIGH_RES_TIMERS=y
9CONFIG_BSD_PROCESS_ACCT=y
11CONFIG_IKCONFIG=y 10CONFIG_IKCONFIG=y
12CONFIG_IKCONFIG_PROC=y 11CONFIG_IKCONFIG_PROC=y
13CONFIG_LOG_BUF_SHIFT=14 12CONFIG_LOG_BUF_SHIFT=14
@@ -113,6 +112,9 @@ CONFIG_DUMMY=y
113CONFIG_FS_ENET=y 112CONFIG_FS_ENET=y
114CONFIG_UCC_GETH=y 113CONFIG_UCC_GETH=y
115CONFIG_GIANFAR=y 114CONFIG_GIANFAR=y
115CONFIG_E1000=y
116CONFIG_E1000E=y
117CONFIG_IGB=y
116CONFIG_MARVELL_PHY=y 118CONFIG_MARVELL_PHY=y
117CONFIG_DAVICOM_PHY=y 119CONFIG_DAVICOM_PHY=y
118CONFIG_CICADA_PHY=y 120CONFIG_CICADA_PHY=y
@@ -132,7 +134,6 @@ CONFIG_SERIAL_8250_DETECT_IRQ=y
132CONFIG_SERIAL_8250_RSA=y 134CONFIG_SERIAL_8250_RSA=y
133CONFIG_SERIAL_QE=m 135CONFIG_SERIAL_QE=m
134CONFIG_NVRAM=y 136CONFIG_NVRAM=y
135CONFIG_I2C=y
136CONFIG_I2C_CHARDEV=y 137CONFIG_I2C_CHARDEV=y
137CONFIG_I2C_CPM=m 138CONFIG_I2C_CPM=m
138CONFIG_I2C_MPC=y 139CONFIG_I2C_MPC=y
@@ -230,7 +231,6 @@ CONFIG_DEBUG_INFO=y
230CONFIG_CRYPTO_PCBC=m 231CONFIG_CRYPTO_PCBC=m
231CONFIG_CRYPTO_SHA256=y 232CONFIG_CRYPTO_SHA256=y
232CONFIG_CRYPTO_SHA512=y 233CONFIG_CRYPTO_SHA512=y
233CONFIG_CRYPTO_AES=y
234# CONFIG_CRYPTO_ANSI_CPRNG is not set 234# CONFIG_CRYPTO_ANSI_CPRNG is not set
235CONFIG_CRYPTO_DEV_FSL_CAAM=y 235CONFIG_CRYPTO_DEV_FSL_CAAM=y
236CONFIG_CRYPTO_DEV_TALITOS=y 236CONFIG_CRYPTO_DEV_TALITOS=y