Merge tag 'cleanup-for-3.8' of git://server.prisktech.co.nz/git/linux…

…wmt into next/cleanup From Tony Prisk: Cleanup for 3.8 Removes a few unused headers from include/mach Removes unused arm/boot/compressed/head-vt8500.S Fixes header text in mach-vt8500/timer.c Signed-off-by: Tony Prisk <linux@prisktech.co.nz> * tag 'cleanup-for-3.8' of git://server.prisktech.co.nz/git/linuxwmt: vt8500: Fix header in mach-vt8500/timer.c vt8500: Remove arm/boot/compressed/head-vt8500.S vt8500: Remove unused headers from include/mach/ Signed-off-by: Olof Johansson <olof@lixom.net>
git-mirror · Oct 16, 2012 · eccfe8b · eccfe8b
2 parents 4afe30d + 83cc769
commit eccfe8b
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 100 deletions.
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
@@ -54,10 +54,6 @@ ifeq ($(CONFIG_ARCH_SA1100),y)
 OBJS		+= head-sa1100.o
 endif
 
-ifeq ($(CONFIG_ARCH_VT8500),y)
-OBJS		+= head-vt8500.o
-endif
-
 ifeq ($(CONFIG_CPU_XSCALE),y)
 OBJS		+= head-xscale.o
 endif

diff --git a/arch/arm/boot/compressed/head-vt8500.S b/arch/arm/boot/compressed/head-vt8500.S
diff --git a/arch/arm/mach-vt8500/include/mach/hardware.h b/arch/arm/mach-vt8500/include/mach/hardware.h
diff --git a/arch/arm/mach-vt8500/include/mach/i8042.h b/arch/arm/mach-vt8500/include/mach/i8042.h
diff --git a/arch/arm/mach-vt8500/include/mach/restart.h b/arch/arm/mach-vt8500/include/mach/restart.h
diff --git a/arch/arm/mach-vt8500/timer.c b/arch/arm/mach-vt8500/timer.c
@@ -1,5 +1,5 @@
 /*
- *  arch/arm/mach-vt8500/timer_dt.c
+ *  arch/arm/mach-vt8500/timer.c
  *
  *  Copyright (C) 2012 Tony Prisk <linux@prisktech.co.nz>
  *  Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>

diff --git a/arch/arm/mach-vt8500/vt8500.c b/arch/arm/mach-vt8500/vt8500.c
@@ -31,8 +31,6 @@
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
 
-#include <mach/restart.h>
-
 #include "common.h"
 
 #define LEGACY_GPIO_BASE	0xD8110000