diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-22 09:21:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-22 09:21:02 -0800 |
| commit | b4a2c87dada12010239b4d5f8f9bc0eb964a614f (patch) | |
| tree | b33903197ae17defc3d61b8d8d744a3e87c22686 /arch/powerpc/configs/cell_defconfig | |
| parent | e45521a8d44da2c4efd17fc8e853f7917e99b57a (diff) | |
| parent | e89debcd18a3ef74b27894e479d6b9e658fc6de6 (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:
[POWERPC] Update defconfigs
[POWERPC] atomic_dec_if_positive sign extension fix
[POWERPC] Fix OF node refcnt underflow in 836x and 832x platform code
[POWERPC] Make it blatantly clear; mpc5200 device tree is not yet stable
[POWERPC] Fix broken DMA on non-LPAR pSeries
[POWERPC] Fix cell's mmio nvram to properly parse device tree
[POWERPC] Remove bogus sanity check in pci -> OF node code
Diffstat (limited to 'arch/powerpc/configs/cell_defconfig')
| -rw-r--r-- | arch/powerpc/configs/cell_defconfig | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig index d1d25152f74..e956548da00 100644 --- a/arch/powerpc/configs/cell_defconfig +++ b/arch/powerpc/configs/cell_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.20-rc1 -# Tue Dec 19 14:59:53 2006 +# Linux kernel version: 2.6.20-rc5 +# Mon Jan 22 22:12:56 2007 # CONFIG_PPC64=y CONFIG_64BIT=y @@ -245,7 +245,6 @@ CONFIG_GENERIC_ISA_DMA=y CONFIG_PCI=y CONFIG_PCI_DOMAINS=y CONFIG_PCIEPORTBUS=y -# CONFIG_PCI_MULTITHREAD_PROBE is not set # CONFIG_PCI_DEBUG is not set # @@ -854,7 +853,6 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_SERIAL_JSM is not set -CONFIG_SERIAL_OF_PLATFORM=y CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set CONFIG_HVC_DRIVER=y |