diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-20 03:41:27 (GMT) |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-20 03:41:27 (GMT) |
| commit | 2c0b713f70ecccaf4f535caf602f41350a9f484a (patch) | |
| tree | ad8954d362140f9ca0c67a86e1899e6be90af8a1 /arch/powerpc/platforms/cell/setup.c | |
| parent | f91266edba3c6ef001819c5abe4c3a0643f66fc9 (diff) | |
| parent | 1e7710390f95b7efb3f74fd2f8b5fc28656b458c (diff) | |
| download | linux-fsl-qoriq-2c0b713f70ecccaf4f535caf602f41350a9f484a.tar.xz | |
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/cell/setup.c')
| -rw-r--r-- | arch/powerpc/platforms/cell/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c index 6a56b64..7f42b7d 100644 --- a/arch/powerpc/platforms/cell/setup.c +++ b/arch/powerpc/platforms/cell/setup.c @@ -30,6 +30,7 @@ #include <linux/console.h> #include <linux/mutex.h> #include <linux/memory_hotplug.h> +#include <linux/of_platform.h> #include <asm/mmu.h> #include <asm/processor.h> @@ -51,7 +52,6 @@ #include <asm/spu_priv1.h> #include <asm/udbg.h> #include <asm/mpic.h> -#include <asm/of_platform.h> #include <asm/cell-regs.h> #include "interrupt.h" |