diff options
author | Dave Kleikamp <shaggy@linux.vnet.ibm.com> | 2009-02-02 13:40:55 -0600 |
---|---|---|
committer | Dave Kleikamp <shaggy@linux.vnet.ibm.com> | 2009-02-02 13:40:55 -0600 |
commit | 8db0c5d5ef3ab99fe9e5151872b75f45c4282e3c (patch) | |
tree | da9759151e00221c58cdd9f4de893c0b08753670 /arch/sh/boards/mach-hp6xx/setup.c | |
parent | 1ad53a98c927a9b5b1b57288ac0edec562fbcf8d (diff) | |
parent | 45c82b5a770be66845687a7d027c8b52946d59af (diff) |
Merge branch 'master' of /home/shaggy/git/linus-clean/
Diffstat (limited to 'arch/sh/boards/mach-hp6xx/setup.c')
-rw-r--r-- | arch/sh/boards/mach-hp6xx/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/boards/mach-hp6xx/setup.c b/arch/sh/boards/mach-hp6xx/setup.c index 48fece78ff54..746742bdc014 100644 --- a/arch/sh/boards/mach-hp6xx/setup.c +++ b/arch/sh/boards/mach-hp6xx/setup.c @@ -12,9 +12,9 @@ #include <linux/types.h> #include <linux/init.h> #include <linux/platform_device.h> +#include <linux/irq.h> #include <asm/hd64461.h> #include <asm/io.h> -#include <asm/irq.h> #include <mach/hp6xx.h> #include <cpu/dac.h> |