diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-28 15:45:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-28 15:45:22 -0500 |
| commit | 5263bf65d6342e12ab716db8e529501670979321 (patch) | |
| tree | 575a714f55e6b05443c182df2673392ea2865fea /arch/powerpc/platforms/ps3/Makefile | |
| parent | 7d620a4e531ae4d432d3c88f7d4b75327d881a87 (diff) | |
| parent | 545da94f924d52f80e2bbea99a8652f454889a2b (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] Fix sys_pciconfig_iobase bus matching
[POWERPC] PS3: add not complete comment to kconfig
[POWERPC] ps3_free_io_irq: Fix inverted error check
[POWERPC] PS3: Fix uniprocessor kernel build
Diffstat (limited to 'arch/powerpc/platforms/ps3/Makefile')
| -rw-r--r-- | arch/powerpc/platforms/ps3/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/ps3/Makefile b/arch/powerpc/platforms/ps3/Makefile index 3757cfabc8ce..1994904f580f 100644 --- a/arch/powerpc/platforms/ps3/Makefile +++ b/arch/powerpc/platforms/ps3/Makefile | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | obj-y += setup.o mm.o smp.o time.o hvcall.o htab.o repository.o | 1 | obj-y += setup.o mm.o time.o hvcall.o htab.o repository.o |
| 2 | obj-y += interrupt.o exports.o os-area.o | 2 | obj-y += interrupt.o exports.o os-area.o |
| 3 | 3 | ||
| 4 | obj-$(CONFIG_SMP) += smp.o | ||
| 4 | obj-$(CONFIG_SPU_BASE) += spu.o | 5 | obj-$(CONFIG_SPU_BASE) += spu.o |