diff options
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/platforms/cell/Makefile | 3 | ||||
-rw-r--r-- | arch/powerpc/platforms/cell/beat_htab.c (renamed from arch/powerpc/platforms/celleb/htab.c) | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/cell/beat_iommu.c (renamed from arch/powerpc/platforms/celleb/iommu.c) | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/celleb/Makefile | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/cell/Makefile b/arch/powerpc/platforms/cell/Makefile index b76d17809ce8..c135a335e2e2 100644 --- a/arch/powerpc/platforms/cell/Makefile +++ b/arch/powerpc/platforms/cell/Makefile | |||
@@ -35,7 +35,8 @@ obj-y += celleb_setup.o \ | |||
35 | celleb_pci.o celleb_scc_epci.o \ | 35 | celleb_pci.o celleb_scc_epci.o \ |
36 | celleb_scc_uhc.o \ | 36 | celleb_scc_uhc.o \ |
37 | io-workarounds.o spider-pci.o \ | 37 | io-workarounds.o spider-pci.o \ |
38 | beat_hvCall.o | 38 | beat_htab.o beat_hvCall.o \ |
39 | beat_iommu.o | ||
39 | 40 | ||
40 | obj-$(CONFIG_SERIAL_TXX9) += celleb_scc_sio.o | 41 | obj-$(CONFIG_SERIAL_TXX9) += celleb_scc_sio.o |
41 | endif | 42 | endif |
diff --git a/arch/powerpc/platforms/celleb/htab.c b/arch/powerpc/platforms/cell/beat_htab.c index 18eaed1107a2..81467ff055c8 100644 --- a/arch/powerpc/platforms/celleb/htab.c +++ b/arch/powerpc/platforms/cell/beat_htab.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #include <asm/machdep.h> | 32 | #include <asm/machdep.h> |
33 | #include <asm/udbg.h> | 33 | #include <asm/udbg.h> |
34 | 34 | ||
35 | #include "../cell/beat_wrapper.h" | 35 | #include "beat_wrapper.h" |
36 | 36 | ||
37 | #ifdef DEBUG_LOW | 37 | #ifdef DEBUG_LOW |
38 | #define DBG_LOW(fmt...) do { udbg_printf(fmt); } while (0) | 38 | #define DBG_LOW(fmt...) do { udbg_printf(fmt); } while (0) |
diff --git a/arch/powerpc/platforms/celleb/iommu.c b/arch/powerpc/platforms/cell/beat_iommu.c index 3eda42381224..93b0efddd658 100644 --- a/arch/powerpc/platforms/celleb/iommu.c +++ b/arch/powerpc/platforms/cell/beat_iommu.c | |||
@@ -26,7 +26,7 @@ | |||
26 | 26 | ||
27 | #include <asm/machdep.h> | 27 | #include <asm/machdep.h> |
28 | 28 | ||
29 | #include "../cell/beat_wrapper.h" | 29 | #include "beat_wrapper.h" |
30 | 30 | ||
31 | #define DMA_FLAGS 0xf800000000000000UL /* r/w permitted, coherency required, | 31 | #define DMA_FLAGS 0xf800000000000000UL /* r/w permitted, coherency required, |
32 | strongest order */ | 32 | strongest order */ |
diff --git a/arch/powerpc/platforms/celleb/Makefile b/arch/powerpc/platforms/celleb/Makefile index 5f612c12b26b..ad319436d8ff 100644 --- a/arch/powerpc/platforms/celleb/Makefile +++ b/arch/powerpc/platforms/celleb/Makefile | |||
@@ -1,5 +1,5 @@ | |||
1 | obj-y += interrupt.o iommu.o \ | 1 | obj-y += interrupt.o \ |
2 | htab.o beat.o | 2 | beat.o |
3 | 3 | ||
4 | obj-$(CONFIG_SMP) += smp.o | 4 | obj-$(CONFIG_SMP) += smp.o |
5 | obj-$(CONFIG_PPC_UDBG_BEAT) += udbg_beat.o | 5 | obj-$(CONFIG_PPC_UDBG_BEAT) += udbg_beat.o |