Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-31 17:21:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
ff61e5ccc3
linux/arch
History
Michael Ellerman ff61e5ccc3 powerpc/cell: Select PCI for IBM_CELL_BLADE AND CELLEB 
Currently PPC_CELL_NATIVE selects PPC_OF_PLATFORM_PCI, but does not
select PCI. This can lead to a config with the former and the latter
disabled, which does not build.

To fix this PPC_CELL_NATIVE should select PCI. However, that would
force PCI on for QPACE, which also selects PPC_CELL_NATIVE. So
instead move the select of PPC_OF_PLATFORM_PCI and PCI under both
IBM_CELL_BLADE and CELLEB.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2009-04-28 13:52:23 +10:00
..
alpha Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-04-05 11:04:19 -07:00
arm Replace all DMA_nBIT_MASK macro with DMA_BIT_MASK(n) 2009-04-13 15:04:33 -07:00
avr32 dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32) 2009-04-07 08:31:11 -07:00
blackfin tty: Blackin CTS/RTS 2009-04-07 08:44:05 -07:00
cris tty: Use the generic RS485 ioctl on CRIS 2009-04-07 08:44:05 -07:00
frv FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
h8300 Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-04-05 11:04:19 -07:00
ia64 Replace all DMA_nBIT_MASK macro with DMA_BIT_MASK(n) 2009-04-13 15:04:33 -07:00
m32r Simplify copy_thread() 2009-04-02 19:04:51 -07:00
m68k Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-04-05 11:04:19 -07:00
m68knommu Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 2009-04-03 09:44:58 -07:00
microblaze microblaze: remove duplicated #include's 2009-04-14 11:09:15 +02:00
mips Merge branch 'next' into for-linus 2009-04-08 00:00:33 -07:00
mn10300 Separate out the proc- and unit-specific header directories from the general 2009-04-10 14:33:48 +01:00
parisc Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 2009-04-03 09:52:04 -07:00
powerpc powerpc/cell: Select PCI for IBM_CELL_BLADE AND CELLEB 2009-04-28 13:52:23 +10:00
s390 mutex: have non-spinning mutexes on s390 by default 2009-04-09 19:28:24 +02:00
sh sh: Add in PCI bus for DMA API debugging. 2009-04-14 15:23:40 +09:00
sparc parport: Fix various uses of parport_pc 2009-04-14 08:48:50 -07:00
um Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-04-05 11:04:19 -07:00
x86 x86 microcode: revert some work_on_cpu 2009-04-14 11:45:59 -07:00
xtensa Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-04-05 11:04:19 -07:00
.gitignore
Kconfig mutex: have non-spinning mutexes on s390 by default 2009-04-09 19:28:24 +02:00