diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 15:52:04 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 15:52:04 +1100 |
| commit | a02efb906d12c9d4eb2ab7c59049ba9545e5412d (patch) | |
| tree | bf1f6467978ec63a22f42299ecac2ee7f7e73336 /arch/sh/boards/mach-highlander/irq-r7780mp.c | |
| parent | 84dfcb4b318463cd4883b6a19937824f49aee564 (diff) | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
| download | op-kernel-dev-a02efb906d12c9d4eb2ab7c59049ba9545e5412d.zip op-kernel-dev-a02efb906d12c9d4eb2ab7c59049ba9545e5412d.tar.gz | |
Merge commit 'origin' into master
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/include/asm/page.h
Diffstat (limited to 'arch/sh/boards/mach-highlander/irq-r7780mp.c')
| -rw-r--r-- | arch/sh/boards/mach-highlander/irq-r7780mp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/boards/mach-highlander/irq-r7780mp.c b/arch/sh/boards/mach-highlander/irq-r7780mp.c index ae1cfcb..83c28bc 100644 --- a/arch/sh/boards/mach-highlander/irq-r7780mp.c +++ b/arch/sh/boards/mach-highlander/irq-r7780mp.c @@ -12,7 +12,7 @@ #include <linux/init.h> #include <linux/irq.h> #include <linux/io.h> -#include <asm/r7780rp.h> +#include <mach/highlander.h> enum { UNUSED = 0, |
