diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-21 17:07:33 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-21 17:07:33 -0400 |
| commit | 608f593b1313080301b76875487af6da508f67a1 (patch) | |
| tree | b775454cd4d1d380134c2d91ff79d0375987dc64 /arch/mn10300/unit-asb2305/unit-init.c | |
| parent | a1acbbf4adcd346f12fc567143eac90ef33f29b0 (diff) | |
| parent | 84a1caf1453c3d44050bd22db958af4a7f99315c (diff) | |
Merge tag 'v3.5-rc7' into next/boards
Linux 3.5-rc7
Prerequisite for samsung/board3 branch.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/mn10300/unit-asb2305/unit-init.c')
| -rw-r--r-- | arch/mn10300/unit-asb2305/unit-init.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mn10300/unit-asb2305/unit-init.c b/arch/mn10300/unit-asb2305/unit-init.c index e1becd6b7571..bc4adfaf815c 100644 --- a/arch/mn10300/unit-asb2305/unit-init.c +++ b/arch/mn10300/unit-asb2305/unit-init.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/pci.h> | 14 | #include <linux/pci.h> |
| 15 | #include <asm/io.h> | 15 | #include <asm/io.h> |
| 16 | #include <asm/irq.h> | ||
| 16 | #include <asm/setup.h> | 17 | #include <asm/setup.h> |
| 17 | #include <asm/processor.h> | 18 | #include <asm/processor.h> |
| 18 | #include <asm/intctl-regs.h> | 19 | #include <asm/intctl-regs.h> |