diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-08-28 07:56:11 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-08-28 07:56:11 +0200 |
| commit | 35438c4327df18dbf5e7f597b69299119f4a14de (patch) | |
| tree | a4589d731015db93f2eba8f84ffb1f48a8084020 /arch/ia64/defconfig | |
| parent | [POWERPC] Stop include asm-ppc when building ARCH=powerpc for ppc32 (diff) | |
| parent | Linux 2.6.23-rc4 (diff) | |
| download | linux-35438c4327df18dbf5e7f597b69299119f4a14de.tar.xz linux-35438c4327df18dbf5e7f597b69299119f4a14de.zip | |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'arch/ia64/defconfig')
| -rw-r--r-- | arch/ia64/defconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/ia64/defconfig b/arch/ia64/defconfig index 03172dc8c403..0210545e7f61 100644 --- a/arch/ia64/defconfig +++ b/arch/ia64/defconfig @@ -53,8 +53,7 @@ CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_VM_EVENT_COUNTERS=y -CONFIG_SLAB=y -# CONFIG_SLUB is not set +CONFIG_SLUB=y # CONFIG_SLOB is not set CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set |