diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-20 14:41:27 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-20 14:41:27 +1100 |
| commit | 2c0b713f70ecccaf4f535caf602f41350a9f484a (patch) | |
| tree | ad8954d362140f9ca0c67a86e1899e6be90af8a1 /arch/powerpc/platforms/celleb | |
| parent | f91266edba3c6ef001819c5abe4c3a0643f66fc9 (diff) | |
| parent | 1e7710390f95b7efb3f74fd2f8b5fc28656b458c (diff) | |
Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/cell-2.6 into for-2.6.25
Diffstat (limited to 'arch/powerpc/platforms/celleb')
| -rw-r--r-- | arch/powerpc/platforms/celleb/iommu.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/celleb/setup.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/celleb/iommu.c b/arch/powerpc/platforms/celleb/iommu.c index 287450a07c4..61df97f4e1a 100644 --- a/arch/powerpc/platforms/celleb/iommu.c +++ b/arch/powerpc/platforms/celleb/iommu.c @@ -22,8 +22,8 @@ #include <linux/init.h> #include <linux/dma-mapping.h> #include <linux/pci.h> +#include <linux/of_platform.h> -#include <asm/of_platform.h> #include <asm/firmware.h> #include "beat_wrapper.h" diff --git a/arch/powerpc/platforms/celleb/setup.c b/arch/powerpc/platforms/celleb/setup.c index 5a3f73478f4..8b03a1bdc79 100644 --- a/arch/powerpc/platforms/celleb/setup.c +++ b/arch/powerpc/platforms/celleb/setup.c @@ -40,6 +40,7 @@ #include <linux/seq_file.h> #include <linux/root_dev.h> #include <linux/console.h> +#include <linux/of_platform.h> #include <asm/mmu.h> #include <asm/processor.h> @@ -52,7 +53,6 @@ #include <asm/time.h> #include <asm/spu_priv1.h> #include <asm/firmware.h> -#include <asm/of_platform.h> #include <asm/rtas.h> #include <asm/cell-regs.h> |