diff options
author | James Morris <jmorris@namei.org> | 2008-08-28 02:47:34 +0200 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2008-08-28 02:47:34 +0200 |
commit | 86d688984deefa3ae5a802880c11f2b408b5d6cf (patch) | |
tree | 7ea5e8189b0a774626d3ed7c3c87df2495a4c4a0 /arch/sh/boards/mach-systemh | |
parent | selinux: add support for installing a dummy policy (v2) (diff) | |
parent | IB/mlx4: Actually return L_Key and R_Key for fast register MRs (diff) | |
download | linux-86d688984deefa3ae5a802880c11f2b408b5d6cf.tar.xz linux-86d688984deefa3ae5a802880c11f2b408b5d6cf.zip |
Merge branch 'master' into next
Diffstat (limited to 'arch/sh/boards/mach-systemh')
-rw-r--r-- | arch/sh/boards/mach-systemh/irq.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sh/boards/mach-systemh/irq.c b/arch/sh/boards/mach-systemh/irq.c index 0ba2fe674c47..601c9c8cdbec 100644 --- a/arch/sh/boards/mach-systemh/irq.c +++ b/arch/sh/boards/mach-systemh/irq.c @@ -11,9 +11,8 @@ #include <linux/init.h> #include <linux/irq.h> +#include <linux/interrupt.h> -#include <linux/hdreg.h> -#include <linux/ide.h> #include <asm/io.h> #include <asm/systemh7751.h> #include <asm/smc37c93x.h> |