diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
| commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
| tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /arch/arm/configs/collie_defconfig | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'arch/arm/configs/collie_defconfig')
| -rw-r--r-- | arch/arm/configs/collie_defconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/configs/collie_defconfig b/arch/arm/configs/collie_defconfig index 074c47a4fb2e..970c8c772eb7 100644 --- a/arch/arm/configs/collie_defconfig +++ b/arch/arm/configs/collie_defconfig | |||
| @@ -219,7 +219,7 @@ CONFIG_BINFMT_ELF=y | |||
| 219 | # Power management options | 219 | # Power management options |
| 220 | # | 220 | # |
| 221 | CONFIG_PM=y | 221 | CONFIG_PM=y |
| 222 | CONFIG_PM_LEGACY=y | 222 | # CONFIG_PM_LEGACY is not set |
| 223 | # CONFIG_PM_DEBUG is not set | 223 | # CONFIG_PM_DEBUG is not set |
| 224 | CONFIG_APM=y | 224 | CONFIG_APM=y |
| 225 | 225 | ||
| @@ -934,7 +934,6 @@ CONFIG_FRAME_POINTER=y | |||
| 934 | CONFIG_FORCED_INLINING=y | 934 | CONFIG_FORCED_INLINING=y |
| 935 | # CONFIG_RCU_TORTURE_TEST is not set | 935 | # CONFIG_RCU_TORTURE_TEST is not set |
| 936 | # CONFIG_DEBUG_USER is not set | 936 | # CONFIG_DEBUG_USER is not set |
| 937 | # CONFIG_DEBUG_WAITQ is not set | ||
| 938 | CONFIG_DEBUG_ERRORS=y | 937 | CONFIG_DEBUG_ERRORS=y |
| 939 | # CONFIG_DEBUG_LL is not set | 938 | # CONFIG_DEBUG_LL is not set |
| 940 | 939 | ||