diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 16:05:55 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 16:05:55 (GMT) |
| commit | c548f08a4f7b89b93c805e0c4024b8302afa7121 (patch) | |
| tree | 5cf791db4912831469b70390aa58376f1c724386 /arch/ppc/Kconfig | |
| parent | 347c53dca73fca317d57781f510f5ff4f6c0d0d7 (diff) | |
| parent | 4acadb965c4aa587aac29a0a91203c4745d6fb4e (diff) | |
| download | linux-c548f08a4f7b89b93c805e0c4024b8302afa7121.tar.xz | |
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/ppc/Kconfig')
| -rw-r--r-- | arch/ppc/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index 20dce46..607925c 100644 --- a/arch/ppc/Kconfig +++ b/arch/ppc/Kconfig @@ -102,6 +102,7 @@ config 44x config 8xx bool "8xx" + select PPC_LIB_RHEAP config E200 bool "e200" @@ -798,6 +799,7 @@ config CPM1 config CPM2 bool depends on 8260 || MPC8560 || MPC8555 + select PPC_LIB_RHEAP default y help The CPM2 (Communications Processor Module) is a coprocessor on @@ -1277,6 +1279,10 @@ config BOOT_LOAD config PIN_TLB bool "Pinned Kernel TLBs (860 ONLY)" depends on ADVANCED_OPTIONS && 8xx + +config PPC_LIB_RHEAP + bool + endmenu source "net/Kconfig" |