diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-08-23 05:43:14 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-08-23 05:43:14 -0400 |
| commit | ac0c955d5048c2c580fa7166a89133f0fd76c125 (patch) | |
| tree | 041ac4fb544c7244a1a0b35c8ceabc142d5645c1 /arch/ia64/configs/tiger_defconfig | |
| parent | 68d09b1b6780415d82160f6b6d88e82bd724e691 (diff) | |
| parent | b377fd3982ad957c796758a90e2988401a884241 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/ia64/configs/tiger_defconfig')
| -rw-r--r-- | arch/ia64/configs/tiger_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/configs/tiger_defconfig b/arch/ia64/configs/tiger_defconfig index 3dbb3987df27..797acf9066c1 100644 --- a/arch/ia64/configs/tiger_defconfig +++ b/arch/ia64/configs/tiger_defconfig | |||
| @@ -53,7 +53,7 @@ CONFIG_TIMERFD=y | |||
| 53 | CONFIG_EVENTFD=y | 53 | CONFIG_EVENTFD=y |
| 54 | CONFIG_SHMEM=y | 54 | CONFIG_SHMEM=y |
| 55 | CONFIG_VM_EVENT_COUNTERS=y | 55 | CONFIG_VM_EVENT_COUNTERS=y |
| 56 | CONFIG_SLAB=y | 56 | CONFIG_SLUB=y |
| 57 | # CONFIG_SLUB is not set | 57 | # CONFIG_SLUB is not set |
| 58 | # CONFIG_SLOB is not set | 58 | # CONFIG_SLOB is not set |
| 59 | CONFIG_RT_MUTEXES=y | 59 | CONFIG_RT_MUTEXES=y |