summaryrefslogtreecommitdiffstats
path: root/arch/sh/boards/mach-hp6xx
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-12 13:08:57 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-12 13:08:57 +0100
commit871cafcc962fa1655c44b4f0e54d4c5cc14e273c (patch)
treefdb7bc65d2606c85b7be6c33ba0dfd5b4e472245 /arch/sh/boards/mach-hp6xx
parentcf2592f59c0e8ed4308adbdb2e0a88655379d579 (diff)
parentb578f3fcca1e78624dfb5f358776e63711d7fda2 (diff)
downloadblackbird-op-linux-871cafcc962fa1655c44b4f0e54d4c5cc14e273c.tar.gz
blackbird-op-linux-871cafcc962fa1655c44b4f0e54d4c5cc14e273c.zip
Merge branch 'linus' into core/softlockup
Diffstat (limited to 'arch/sh/boards/mach-hp6xx')
-rw-r--r--arch/sh/boards/mach-hp6xx/setup.c2
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>
OpenPOWER on IntegriCloud