diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-27 11:30:31 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-27 11:30:31 +0100 |
| commit | b0df89868006517417251e02cc4ce5d4b0165885 (patch) | |
| tree | 6800388c633a13f64fd1f7845ce026ca2606522f /arch/arm/mach-highbank/highbank.c | |
| parent | Merge branches 'l2', 'pgt2' and 'misc' into for-linus (diff) | |
| parent | Merge branch 'sched_clock-for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable (diff) | |
| download | linux-dev-b0df89868006517417251e02cc4ce5d4b0165885.tar.xz linux-dev-b0df89868006517417251e02cc4ce5d4b0165885.zip | |
Merge branch 'devel-stable' into for-linus
Conflicts:
arch/arm/Kconfig.debug
arch/arm/plat-versatile/Kconfig
Merge fixes:
arch/arm/mach-integrator/Kconfig
drivers/clocksource/Kconfig
Diffstat (limited to 'arch/arm/mach-highbank/highbank.c')
| -rw-r--r-- | arch/arm/mach-highbank/highbank.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index 7afbe1e55beb..ee228ef3d27d 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c @@ -33,7 +33,6 @@ #include <asm/mach/arch.h> #include <asm/mach/map.h> #include <asm/mach/time.h> -#include <mach/irqs.h> #include "core.h" #include "sysregs.h" |