diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-12-07 04:57:19 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-12-07 04:57:19 -0500 |
| commit | 8d1413b28033c49c7f1a4d320e815d7a5531acee (patch) | |
| tree | b37281abef014cd60803b81c100388d7a475d49e /arch/powerpc/platforms/ps3/Makefile | |
| parent | ed25ffa16434724f5ed825aa48734c7f3aefa203 (diff) | |
| parent | 620034c84d1d939717bdfbe02c51a3fee43541c3 (diff) | |
Merge branch 'master' into upstream
Conflicts:
drivers/net/netxen/netxen_nic.h
drivers/net/netxen/netxen_nic_main.c
Diffstat (limited to 'arch/powerpc/platforms/ps3/Makefile')
| -rw-r--r-- | arch/powerpc/platforms/ps3/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/ps3/Makefile b/arch/powerpc/platforms/ps3/Makefile new file mode 100644 index 000000000000..3757cfabc8ce --- /dev/null +++ b/arch/powerpc/platforms/ps3/Makefile | |||
| @@ -0,0 +1,4 @@ | |||
| 1 | obj-y += setup.o mm.o smp.o time.o hvcall.o htab.o repository.o | ||
| 2 | obj-y += interrupt.o exports.o os-area.o | ||
| 3 | |||
| 4 | obj-$(CONFIG_SPU_BASE) += spu.o | ||