diff options
| author | Becky Bruce <beckyb@kernel.crashing.org> | 2011-10-10 16:50:45 -0400 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2011-10-12 00:28:38 -0400 |
| commit | 7c4b2f099f9b9c3580a3b606aff1fe13218fce48 (patch) | |
| tree | c66e30c0a942753c4c27f57d3f547e57d53ad296 /arch/powerpc/configs/mpc85xx_defconfig | |
| parent | de423ff5b0b50746616dfacbd67a2290ed70b590 (diff) | |
powerpc: Update mpc85xx/corenet 32-bit defconfigs
Results from updates via make savedefconfig.
Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/configs/mpc85xx_defconfig')
| -rw-r--r-- | arch/powerpc/configs/mpc85xx_defconfig | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig index 250091207452..a1e5a178a4ac 100644 --- a/arch/powerpc/configs/mpc85xx_defconfig +++ b/arch/powerpc/configs/mpc85xx_defconfig | |||
| @@ -10,10 +10,8 @@ CONFIG_IKCONFIG=y | |||
| 10 | CONFIG_IKCONFIG_PROC=y | 10 | CONFIG_IKCONFIG_PROC=y |
| 11 | CONFIG_LOG_BUF_SHIFT=14 | 11 | CONFIG_LOG_BUF_SHIFT=14 |
| 12 | CONFIG_BLK_DEV_INITRD=y | 12 | CONFIG_BLK_DEV_INITRD=y |
| 13 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 14 | CONFIG_EXPERT=y | 13 | CONFIG_EXPERT=y |
| 15 | CONFIG_KALLSYMS_ALL=y | 14 | CONFIG_KALLSYMS_ALL=y |
| 16 | CONFIG_KALLSYMS_EXTRA_PASS=y | ||
| 17 | CONFIG_MODULES=y | 15 | CONFIG_MODULES=y |
| 18 | CONFIG_MODULE_UNLOAD=y | 16 | CONFIG_MODULE_UNLOAD=y |
| 19 | CONFIG_MODULE_FORCE_UNLOAD=y | 17 | CONFIG_MODULE_FORCE_UNLOAD=y |
| @@ -41,7 +39,6 @@ CONFIG_TQM8560=y | |||
| 41 | CONFIG_SBC8548=y | 39 | CONFIG_SBC8548=y |
| 42 | CONFIG_QUICC_ENGINE=y | 40 | CONFIG_QUICC_ENGINE=y |
| 43 | CONFIG_QE_GPIO=y | 41 | CONFIG_QE_GPIO=y |
| 44 | CONFIG_GPIO_MPC8XXX=y | ||
| 45 | CONFIG_HIGHMEM=y | 42 | CONFIG_HIGHMEM=y |
| 46 | CONFIG_NO_HZ=y | 43 | CONFIG_NO_HZ=y |
| 47 | CONFIG_HIGH_RES_TIMERS=y | 44 | CONFIG_HIGH_RES_TIMERS=y |
| @@ -123,6 +120,7 @@ CONFIG_NVRAM=y | |||
| 123 | CONFIG_I2C=y | 120 | CONFIG_I2C=y |
| 124 | CONFIG_I2C_CPM=m | 121 | CONFIG_I2C_CPM=m |
| 125 | CONFIG_I2C_MPC=y | 122 | CONFIG_I2C_MPC=y |
| 123 | CONFIG_GPIO_MPC8XXX=y | ||
| 126 | # CONFIG_HWMON is not set | 124 | # CONFIG_HWMON is not set |
| 127 | CONFIG_VIDEO_OUTPUT_CONTROL=y | 125 | CONFIG_VIDEO_OUTPUT_CONTROL=y |
| 128 | CONFIG_FB=y | 126 | CONFIG_FB=y |
| @@ -206,7 +204,6 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 206 | CONFIG_MAC_PARTITION=y | 204 | CONFIG_MAC_PARTITION=y |
| 207 | CONFIG_CRC_T10DIF=y | 205 | CONFIG_CRC_T10DIF=y |
| 208 | CONFIG_DEBUG_FS=y | 206 | CONFIG_DEBUG_FS=y |
| 209 | CONFIG_DEBUG_KERNEL=y | ||
| 210 | CONFIG_DETECT_HUNG_TASK=y | 207 | CONFIG_DETECT_HUNG_TASK=y |
| 211 | CONFIG_DEBUG_INFO=y | 208 | CONFIG_DEBUG_INFO=y |
| 212 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 209 | CONFIG_SYSCTL_SYSCALL_CHECK=y |