diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/configs/mpc85xx_defconfig | 8 |
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 @@ | |||
1 | CONFIG_PPC_85xx=y | 1 | CONFIG_PPC_85xx=y |
2 | CONFIG_PHYS_64BIT=y | 2 | CONFIG_PHYS_64BIT=y |
3 | CONFIG_EXPERIMENTAL=y | ||
4 | CONFIG_SYSVIPC=y | 3 | CONFIG_SYSVIPC=y |
5 | CONFIG_POSIX_MQUEUE=y | 4 | CONFIG_POSIX_MQUEUE=y |
6 | CONFIG_BSD_PROCESS_ACCT=y | ||
7 | CONFIG_AUDIT=y | 5 | CONFIG_AUDIT=y |
8 | CONFIG_IRQ_DOMAIN_DEBUG=y | 6 | CONFIG_IRQ_DOMAIN_DEBUG=y |
9 | CONFIG_NO_HZ=y | 7 | CONFIG_NO_HZ=y |
10 | CONFIG_HIGH_RES_TIMERS=y | 8 | CONFIG_HIGH_RES_TIMERS=y |
9 | CONFIG_BSD_PROCESS_ACCT=y | ||
11 | CONFIG_IKCONFIG=y | 10 | CONFIG_IKCONFIG=y |
12 | CONFIG_IKCONFIG_PROC=y | 11 | CONFIG_IKCONFIG_PROC=y |
13 | CONFIG_LOG_BUF_SHIFT=14 | 12 | CONFIG_LOG_BUF_SHIFT=14 |
@@ -113,6 +112,9 @@ CONFIG_DUMMY=y | |||
113 | CONFIG_FS_ENET=y | 112 | CONFIG_FS_ENET=y |
114 | CONFIG_UCC_GETH=y | 113 | CONFIG_UCC_GETH=y |
115 | CONFIG_GIANFAR=y | 114 | CONFIG_GIANFAR=y |
115 | CONFIG_E1000=y | ||
116 | CONFIG_E1000E=y | ||
117 | CONFIG_IGB=y | ||
116 | CONFIG_MARVELL_PHY=y | 118 | CONFIG_MARVELL_PHY=y |
117 | CONFIG_DAVICOM_PHY=y | 119 | CONFIG_DAVICOM_PHY=y |
118 | CONFIG_CICADA_PHY=y | 120 | CONFIG_CICADA_PHY=y |
@@ -132,7 +134,6 @@ CONFIG_SERIAL_8250_DETECT_IRQ=y | |||
132 | CONFIG_SERIAL_8250_RSA=y | 134 | CONFIG_SERIAL_8250_RSA=y |
133 | CONFIG_SERIAL_QE=m | 135 | CONFIG_SERIAL_QE=m |
134 | CONFIG_NVRAM=y | 136 | CONFIG_NVRAM=y |
135 | CONFIG_I2C=y | ||
136 | CONFIG_I2C_CHARDEV=y | 137 | CONFIG_I2C_CHARDEV=y |
137 | CONFIG_I2C_CPM=m | 138 | CONFIG_I2C_CPM=m |
138 | CONFIG_I2C_MPC=y | 139 | CONFIG_I2C_MPC=y |
@@ -230,7 +231,6 @@ CONFIG_DEBUG_INFO=y | |||
230 | CONFIG_CRYPTO_PCBC=m | 231 | CONFIG_CRYPTO_PCBC=m |
231 | CONFIG_CRYPTO_SHA256=y | 232 | CONFIG_CRYPTO_SHA256=y |
232 | CONFIG_CRYPTO_SHA512=y | 233 | CONFIG_CRYPTO_SHA512=y |
233 | CONFIG_CRYPTO_AES=y | ||
234 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 234 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
235 | CONFIG_CRYPTO_DEV_FSL_CAAM=y | 235 | CONFIG_CRYPTO_DEV_FSL_CAAM=y |
236 | CONFIG_CRYPTO_DEV_TALITOS=y | 236 | CONFIG_CRYPTO_DEV_TALITOS=y |