diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-22 20:34:09 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-22 20:34:09 +0200 |
commit | f20e3b5fe7ead0615309433260b9784d8da0bbbd (patch) | |
tree | eabb2e47a0355ac4e8024b7087b4e7cb9f324358 /arch/sh/boards/mach-highlander/irq-r7785rp.c | |
parent | Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmia... (diff) | |
parent | [ARM] msm: vreg interface to msm7k pmic (diff) | |
download | linux-f20e3b5fe7ead0615309433260b9784d8da0bbbd.tar.xz linux-f20e3b5fe7ead0615309433260b9784d8da0bbbd.zip |
Merge branch 'for-rmk' of git://git.android.com/kernel into devel
Diffstat (limited to 'arch/sh/boards/mach-highlander/irq-r7785rp.c')
-rw-r--r-- | arch/sh/boards/mach-highlander/irq-r7785rp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/boards/mach-highlander/irq-r7785rp.c b/arch/sh/boards/mach-highlander/irq-r7785rp.c index 896c045aa39d..3811b060a39b 100644 --- a/arch/sh/boards/mach-highlander/irq-r7785rp.c +++ b/arch/sh/boards/mach-highlander/irq-r7785rp.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, |