diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 18:51:06 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 18:51:06 -0500 |
| commit | 0811a433c61e85f895018239c4466a36311cd5de (patch) | |
| tree | 276933e518e5525d24ae37b02df2db9909679260 /arch/arm/mach-at91/at91cap9.c | |
| parent | c299030765292434b73572f9bcfe84951ff06614 (diff) | |
| parent | 3d14bdad40315b54470cb7812293d14c8af2bf7d (diff) | |
Merge branch 'linus' into core/iommu
Diffstat (limited to 'arch/arm/mach-at91/at91cap9.c')
| -rw-r--r-- | arch/arm/mach-at91/at91cap9.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/at91cap9.c b/arch/arm/mach-at91/at91cap9.c index 0a38c69fdbc4..73376170fb91 100644 --- a/arch/arm/mach-at91/at91cap9.c +++ b/arch/arm/mach-at91/at91cap9.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 16 | #include <linux/pm.h> | 16 | #include <linux/pm.h> |
| 17 | 17 | ||
| 18 | #include <asm/irq.h> | ||
| 18 | #include <asm/mach/arch.h> | 19 | #include <asm/mach/arch.h> |
| 19 | #include <asm/mach/map.h> | 20 | #include <asm/mach/map.h> |
| 20 | 21 | ||