diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-12-09 14:36:59 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-12-09 14:36:59 +1100 |
| commit | 56d8adc5695a8d3f070c8498d532389580af5611 (patch) | |
| tree | bbcb6c38506af002e94e64df8ab1540e6aba7825 /arch/powerpc/platforms | |
| parent | f4b98415953dcf85bac4ea0a2264a3ead4a7bcc4 (diff) | |
| parent | ee2ffd8bbb2170f9b52fc8ff4aebe9702e0de651 (diff) | |
Merge remote branch 'jwb/next' into next
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/44x/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/44x/Makefile b/arch/powerpc/platforms/44x/Makefile index 82ff326e079..c04d16df848 100644 --- a/arch/powerpc/platforms/44x/Makefile +++ b/arch/powerpc/platforms/44x/Makefile @@ -1,4 +1,7 @@ -obj-$(CONFIG_44x) := misc_44x.o idle.o +obj-$(CONFIG_44x) += misc_44x.o +ifneq ($(CONFIG_PPC4xx_CPM),y) +obj-$(CONFIG_44x) += idle.o +endif obj-$(CONFIG_PPC44x_SIMPLE) += ppc44x_simple.o obj-$(CONFIG_EBONY) += ebony.o obj-$(CONFIG_SAM440EP) += sam440ep.o |