diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 12:05:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 12:05:55 -0400 |
| commit | c548f08a4f7b89b93c805e0c4024b8302afa7121 (patch) | |
| tree | 5cf791db4912831469b70390aa58376f1c724386 /arch/powerpc/configs/g5_defconfig | |
| parent | 347c53dca73fca317d57781f510f5ff4f6c0d0d7 (diff) | |
| parent | 4acadb965c4aa587aac29a0a91203c4745d6fb4e (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (24 commits)
[POWERPC] Fix vmemmap warning in init_64.c
[POWERPC] Fix 64 bits vDSO DWARF info for CR register
[POWERPC] Add 1TB workaround for PA6T
[POWERPC] Enable NO_HZ and high res timers for pseries and ppc64 configs
[POWERPC] Quieten cache information at boot
[POWERPC] Quieten clockevent printk
[POWERPC] Enable SLUB in *_defconfig
[POWERPC] Fix 1TB segment detection
[POWERPC] Fix iSeries_hpte_insert prototype
[POWERPC] Fix copyright symbol
[POWERPC] ibmebus: Move to of_device and of_platform_driver, match eHCA and eHEA drivers
[POWERPC] ibmebus: Add device creation and bus probing based on of_device
[POWERPC] ibmebus: Remove bus match/probe/remove functions
[POWERPC] Move of_device allocation into of_device.[ch]
[POWERPC] mpc52xx: device tree changes for FEC and MDIO
[POWERPC] bestcomm: GenBD task support
[POWERPC] bestcomm: FEC task support
[POWERPC] bestcomm: ATA task support
[POWERPC] bestcomm: core bestcomm support for Freescale MPC5200
[POWERPC] mpc52xx: Update mpc52xx_psc structure with B revision changes
...
Diffstat (limited to 'arch/powerpc/configs/g5_defconfig')
| -rw-r--r-- | arch/powerpc/configs/g5_defconfig | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig index a655d87b3f8b..0a6fa1fc9766 100644 --- a/arch/powerpc/configs/g5_defconfig +++ b/arch/powerpc/configs/g5_defconfig | |||
| @@ -92,8 +92,9 @@ CONFIG_TIMERFD=y | |||
| 92 | CONFIG_EVENTFD=y | 92 | CONFIG_EVENTFD=y |
| 93 | CONFIG_SHMEM=y | 93 | CONFIG_SHMEM=y |
| 94 | CONFIG_VM_EVENT_COUNTERS=y | 94 | CONFIG_VM_EVENT_COUNTERS=y |
| 95 | CONFIG_SLAB=y | 95 | CONFIG_SLUB_DEBUG=y |
| 96 | # CONFIG_SLUB is not set | 96 | # CONFIG_SLAB is not set |
| 97 | CONFIG_SLUB=y | ||
| 97 | # CONFIG_SLOB is not set | 98 | # CONFIG_SLOB is not set |
| 98 | CONFIG_RT_MUTEXES=y | 99 | CONFIG_RT_MUTEXES=y |
| 99 | # CONFIG_TINY_SHMEM is not set | 100 | # CONFIG_TINY_SHMEM is not set |
| @@ -1580,7 +1581,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1580 | CONFIG_SCHED_DEBUG=y | 1581 | CONFIG_SCHED_DEBUG=y |
| 1581 | # CONFIG_SCHEDSTATS is not set | 1582 | # CONFIG_SCHEDSTATS is not set |
| 1582 | # CONFIG_TIMER_STATS is not set | 1583 | # CONFIG_TIMER_STATS is not set |
| 1583 | # CONFIG_DEBUG_SLAB is not set | 1584 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1584 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1585 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 1585 | # CONFIG_RT_MUTEX_TESTER is not set | 1586 | # CONFIG_RT_MUTEX_TESTER is not set |
| 1586 | # CONFIG_DEBUG_SPINLOCK is not set | 1587 | # CONFIG_DEBUG_SPINLOCK is not set |