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/spitz_defconfig | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'arch/arm/configs/spitz_defconfig')
| -rw-r--r-- | arch/arm/configs/spitz_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/spitz_defconfig b/arch/arm/configs/spitz_defconfig index d1ace3abfd8a..aa7a01179500 100644 --- a/arch/arm/configs/spitz_defconfig +++ b/arch/arm/configs/spitz_defconfig | |||
| @@ -207,6 +207,7 @@ CONFIG_BINFMT_MISC=m | |||
| 207 | # Power management options | 207 | # Power management options |
| 208 | # | 208 | # |
| 209 | CONFIG_PM=y | 209 | CONFIG_PM=y |
| 210 | # CONFIG_PM_LEGACY is not set | ||
| 210 | CONFIG_APM=y | 211 | CONFIG_APM=y |
| 211 | 212 | ||
| 212 | # | 213 | # |
| @@ -1405,7 +1406,6 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 1405 | CONFIG_FRAME_POINTER=y | 1406 | CONFIG_FRAME_POINTER=y |
| 1406 | # CONFIG_RCU_TORTURE_TEST is not set | 1407 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1407 | # CONFIG_DEBUG_USER is not set | 1408 | # CONFIG_DEBUG_USER is not set |
| 1408 | # CONFIG_DEBUG_WAITQ is not set | ||
| 1409 | CONFIG_DEBUG_ERRORS=y | 1409 | CONFIG_DEBUG_ERRORS=y |
| 1410 | CONFIG_DEBUG_LL=y | 1410 | CONFIG_DEBUG_LL=y |
| 1411 | # CONFIG_DEBUG_ICEDCC is not set | 1411 | # CONFIG_DEBUG_ICEDCC is not set |