diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
| commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
| tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /arch/um/defconfig | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'arch/um/defconfig')
| -rw-r--r-- | arch/um/defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/defconfig b/arch/um/defconfig index 402a74dc5026..780cc0a4a128 100644 --- a/arch/um/defconfig +++ b/arch/um/defconfig | |||
| @@ -526,4 +526,3 @@ CONFIG_FORCED_INLINING=y | |||
| 526 | # CONFIG_RCU_TORTURE_TEST is not set | 526 | # CONFIG_RCU_TORTURE_TEST is not set |
| 527 | # CONFIG_GPROF is not set | 527 | # CONFIG_GPROF is not set |
| 528 | # CONFIG_GCOV is not set | 528 | # CONFIG_GCOV is not set |
| 529 | # CONFIG_SYSCALL_DEBUG is not set | ||