diff options
Diffstat (limited to 'arch/arm/configs/ixp4xx_defconfig')
| -rw-r--r-- | arch/arm/configs/ixp4xx_defconfig | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/configs/ixp4xx_defconfig b/arch/arm/configs/ixp4xx_defconfig index 4975b914f923..fabf74c51a88 100644 --- a/arch/arm/configs/ixp4xx_defconfig +++ b/arch/arm/configs/ixp4xx_defconfig | |||
| @@ -206,10 +206,8 @@ CONFIG_BINFMT_ELF=y | |||
| 206 | # | 206 | # |
| 207 | # Power management options | 207 | # Power management options |
| 208 | # | 208 | # |
| 209 | CONFIG_PM=y | 209 | # CONFIG_PM is not set |
| 210 | CONFIG_PM_LEGACY=y | 210 | # CONFIG_APM is not set |
| 211 | # CONFIG_PM_DEBUG is not set | ||
| 212 | CONFIG_APM=y | ||
| 213 | 211 | ||
| 214 | # | 212 | # |
| 215 | # Networking | 213 | # Networking |
| @@ -1245,7 +1243,6 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 1245 | CONFIG_FRAME_POINTER=y | 1243 | CONFIG_FRAME_POINTER=y |
| 1246 | # CONFIG_RCU_TORTURE_TEST is not set | 1244 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1247 | # CONFIG_DEBUG_USER is not set | 1245 | # CONFIG_DEBUG_USER is not set |
| 1248 | # CONFIG_DEBUG_WAITQ is not set | ||
| 1249 | CONFIG_DEBUG_ERRORS=y | 1246 | CONFIG_DEBUG_ERRORS=y |
| 1250 | CONFIG_DEBUG_LL=y | 1247 | CONFIG_DEBUG_LL=y |
| 1251 | # CONFIG_DEBUG_ICEDCC is not set | 1248 | # CONFIG_DEBUG_ICEDCC is not set |