diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-24 23:08:54 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-24 23:08:54 +0100 |
| commit | f949c0edd84101bfd30b3e7389c1a12b067e561d (patch) | |
| tree | ba39033c089a66a8d4ac058f3f03a8ed2a488f91 /arch/arm/mach-spear6xx/spear6xx.c | |
| parent | Merge branch 'devel-stable' into devel (diff) | |
| parent | ARM: 5939/1: ARM: Add option CMDLINE_FORCE to force usage of the in-kernel cmdline (diff) | |
| download | linux-dev-f949c0edd84101bfd30b3e7389c1a12b067e561d.tar.xz linux-dev-f949c0edd84101bfd30b3e7389c1a12b067e561d.zip | |
Merge branch 'master' into devel
Diffstat (limited to 'arch/arm/mach-spear6xx/spear6xx.c')
| -rw-r--r-- | arch/arm/mach-spear6xx/spear6xx.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-spear6xx/spear6xx.c b/arch/arm/mach-spear6xx/spear6xx.c index b67e571d4bf7..baf6bcc3169c 100644 --- a/arch/arm/mach-spear6xx/spear6xx.c +++ b/arch/arm/mach-spear6xx/spear6xx.c @@ -13,7 +13,6 @@ #include <linux/types.h> #include <linux/amba/pl061.h> -#include <linux/types.h> #include <linux/ptrace.h> #include <linux/io.h> #include <asm/hardware/vic.h> |