diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-30 16:06:46 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-30 16:06:46 -0700 |
| commit | 929d138a3ba776145d2f421c2c4f16d922535090 (patch) | |
| tree | cb725266d584eb6a64d4bbc010449bb50ecac247 /arch/arm/mach-vexpress | |
| parent | d64f41d8d2dabf4d10a11f7a5d1ef8706969655f (diff) | |
| parent | 67e7ebc21ff5a5bbcb10c9a980896f0e253bcd40 (diff) | |
Merge branch 'late/soc' into devel-late
* late/soc:
ARM: vexpress: Remove twice included header files
ARM: vexpress: Device Tree updates
ARM: EXYNOS: Support suspend and resume for EXYNOS5250
ARM: EXYNOS: Add Clock register list for save and restore
ARM: EXYNOS: Add PMU table for EXYNOS5250
ARM: EXYNOS: Rename of function for pm.c
ARM: EXYNOS: Remove GIC save & restore function
ARM: dts: Add node for interrupt combiner controller on EXYNOS5250
ARM: S3C24XX: add support for second irq set of S3C2416
Diffstat (limited to 'arch/arm/mach-vexpress')
| -rw-r--r-- | arch/arm/mach-vexpress/v2m.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c index 04dd092211b8..fde26adaef32 100644 --- a/arch/arm/mach-vexpress/v2m.c +++ b/arch/arm/mach-vexpress/v2m.c @@ -14,7 +14,6 @@ #include <linux/ata_platform.h> #include <linux/smsc911x.h> #include <linux/spinlock.h> -#include <linux/device.h> #include <linux/usb/isp1760.h> #include <linux/clkdev.h> #include <linux/mtd/physmap.h> @@ -31,7 +30,6 @@ #include <asm/hardware/gic.h> #include <asm/hardware/timer-sp.h> #include <asm/hardware/sp810.h> -#include <asm/hardware/gic.h> #include <mach/ct-ca9x4.h> #include <mach/motherboard.h> |