From: Lucas Woods <woodzy@gmail.com>

Signed-off-by: Lucas Woods <woodzy@gmail.com>
Cc: Christian Zankel <chris@zankel.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/xtensa/kernel/asm-offsets.c   |    1 -
 arch/xtensa/kernel/syscall.c       |    1 -
 arch/xtensa/mm/cache.c             |    1 -
 arch/xtensa/platform-iss/network.c |    1 -
 4 files changed, 4 deletions(-)

diff -puN arch/xtensa/kernel/asm-offsets.c~arch-xtensa-remove-duplicate-includes arch/xtensa/kernel/asm-offsets.c
--- a/arch/xtensa/kernel/asm-offsets.c~arch-xtensa-remove-duplicate-includes
+++ a/arch/xtensa/kernel/asm-offsets.c
@@ -21,7 +21,6 @@
 #include <linux/mm.h>
 
 #include <asm/ptrace.h>
-#include <asm/processor.h>
 #include <asm/uaccess.h>
 
 #define DEFINE(sym, val) asm volatile("\n->" #sym " %0 " #val : : "i" (val))
diff -puN arch/xtensa/kernel/syscall.c~arch-xtensa-remove-duplicate-includes arch/xtensa/kernel/syscall.c
--- a/arch/xtensa/kernel/syscall.c~arch-xtensa-remove-duplicate-includes
+++ a/arch/xtensa/kernel/syscall.c
@@ -36,7 +36,6 @@ syscall_t sys_call_table[__NR_syscall_co
 #define __SYSCALL(nr,symbol,nargs) [ nr ] = (syscall_t)symbol,
 #undef _XTENSA_UNISTD_H
 #undef  __KERNEL_SYSCALLS__
-#include <asm/unistd.h>
 };
 
 /*
diff -puN arch/xtensa/mm/cache.c~arch-xtensa-remove-duplicate-includes arch/xtensa/mm/cache.c
--- a/arch/xtensa/mm/cache.c~arch-xtensa-remove-duplicate-includes
+++ a/arch/xtensa/mm/cache.c
@@ -25,7 +25,6 @@
 #include <linux/swap.h>
 #include <linux/pagemap.h>
 
-#include <asm/pgtable.h>
 #include <asm/bootparam.h>
 #include <asm/mmu_context.h>
 #include <asm/tlb.h>
diff -puN arch/xtensa/platform-iss/network.c~arch-xtensa-remove-duplicate-includes arch/xtensa/platform-iss/network.c
--- a/arch/xtensa/platform-iss/network.c~arch-xtensa-remove-duplicate-includes
+++ a/arch/xtensa/platform-iss/network.c
@@ -31,7 +31,6 @@
 #include <linux/bootmem.h>
 #include <linux/ethtool.h>
 #include <linux/rtnetlink.h>
-#include <linux/timer.h>
 #include <linux/platform_device.h>
 
 #include <asm/platform/simcall.h>
_