diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 15:54:53 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 16:01:40 -0400 |
| commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
| tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /arch/arm/common | |
| parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
| parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/arm/common')
| -rw-r--r-- | arch/arm/common/vic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/common/vic.c b/arch/arm/common/vic.c index 920ced0b73c5..f232941de8ab 100644 --- a/arch/arm/common/vic.c +++ b/arch/arm/common/vic.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/list.h> | 22 | #include <linux/list.h> |
| 23 | #include <linux/io.h> | 23 | #include <linux/io.h> |
| 24 | #include <linux/sysdev.h> | 24 | #include <linux/sysdev.h> |
| 25 | #include <linux/device.h> | ||
| 25 | #include <linux/amba/bus.h> | 26 | #include <linux/amba/bus.h> |
| 26 | 27 | ||
| 27 | #include <asm/mach/irq.h> | 28 | #include <asm/mach/irq.h> |