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/mx1ads_defconfig | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'arch/arm/configs/mx1ads_defconfig')
| -rw-r--r-- | arch/arm/configs/mx1ads_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/mx1ads_defconfig b/arch/arm/configs/mx1ads_defconfig index d16f6cd6e039..577d7e1b5d42 100644 --- a/arch/arm/configs/mx1ads_defconfig +++ b/arch/arm/configs/mx1ads_defconfig | |||
| @@ -691,7 +691,6 @@ CONFIG_DEBUG_INFO=y | |||
| 691 | # CONFIG_DEBUG_FS is not set | 691 | # CONFIG_DEBUG_FS is not set |
| 692 | CONFIG_FRAME_POINTER=y | 692 | CONFIG_FRAME_POINTER=y |
| 693 | CONFIG_DEBUG_USER=y | 693 | CONFIG_DEBUG_USER=y |
| 694 | # CONFIG_DEBUG_WAITQ is not set | ||
| 695 | CONFIG_DEBUG_ERRORS=y | 694 | CONFIG_DEBUG_ERRORS=y |
| 696 | # CONFIG_DEBUG_LL is not set | 695 | # CONFIG_DEBUG_LL is not set |
| 697 | 696 | ||