From d97358af824633363171b5860f66cbf720edf873 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 13 Jun 2012 11:59:47 +0900
Subject: [PATCH] --- yaml --- r: 310698 b: refs/heads/master c:
 1318002aebadf18217ad3de677b6c96b8140dcff h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/sh/include/asm/Kbuild        | 5 +++++
 trunk/arch/sh/include/asm/delay.h       | 1 -
 trunk/arch/sh/include/asm/kvm_para.h    | 1 -
 trunk/arch/sh/include/asm/local64.h     | 1 -
 trunk/arch/sh/include/asm/scatterlist.h | 6 ------
 trunk/arch/sh/include/asm/sizes.h       | 1 -
 7 files changed, 6 insertions(+), 11 deletions(-)
 delete mode 100644 trunk/arch/sh/include/asm/delay.h
 delete mode 100644 trunk/arch/sh/include/asm/kvm_para.h
 delete mode 100644 trunk/arch/sh/include/asm/local64.h
 delete mode 100644 trunk/arch/sh/include/asm/scatterlist.h
 delete mode 100644 trunk/arch/sh/include/asm/sizes.h

diff --git a/[refs] b/[refs]
index 6b5bb276d836..dabff4074c77 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec3d753c5f77ecce0f5d3b8ab603b54b4fd2a106
+refs/heads/master: 1318002aebadf18217ad3de677b6c96b8140dcff
diff --git a/trunk/arch/sh/include/asm/Kbuild b/trunk/arch/sh/include/asm/Kbuild
index 09d1e60ef478..7b673ddcd555 100644
--- a/trunk/arch/sh/include/asm/Kbuild
+++ b/trunk/arch/sh/include/asm/Kbuild
@@ -3,6 +3,7 @@ include include/asm-generic/Kbuild.asm
 generic-y += bitsperlong.h
 generic-y += cputime.h
 generic-y += current.h
+generic-y += delay.h
 generic-y += div64.h
 generic-y += emergency-restart.h
 generic-y += errno.h
@@ -10,7 +11,9 @@ generic-y += fcntl.h
 generic-y += ioctl.h
 generic-y += ipcbuf.h
 generic-y += irq_regs.h
+generic-y += kvm_para.h
 generic-y += local.h
+generic-y += local64.h
 generic-y += param.h
 generic-y += parport.h
 generic-y += percpu.h
@@ -18,10 +21,12 @@ generic-y += poll.h
 generic-y += mman.h
 generic-y += msgbuf.h
 generic-y += resource.h
+generic-y += scatterlist.h
 generic-y += sembuf.h
 generic-y += serial.h
 generic-y += shmbuf.h
 generic-y += siginfo.h
+generic-y += sizes.h
 generic-y += socket.h
 generic-y += statfs.h
 generic-y += termbits.h
diff --git a/trunk/arch/sh/include/asm/delay.h b/trunk/arch/sh/include/asm/delay.h
deleted file mode 100644
index 9670e127b7b2..000000000000
--- a/trunk/arch/sh/include/asm/delay.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/delay.h>
diff --git a/trunk/arch/sh/include/asm/kvm_para.h b/trunk/arch/sh/include/asm/kvm_para.h
deleted file mode 100644
index 14fab8f0b957..000000000000
--- a/trunk/arch/sh/include/asm/kvm_para.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/kvm_para.h>
diff --git a/trunk/arch/sh/include/asm/local64.h b/trunk/arch/sh/include/asm/local64.h
deleted file mode 100644
index 36c93b5cc239..000000000000
--- a/trunk/arch/sh/include/asm/local64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/local64.h>
diff --git a/trunk/arch/sh/include/asm/scatterlist.h b/trunk/arch/sh/include/asm/scatterlist.h
deleted file mode 100644
index 98dfc3510f10..000000000000
--- a/trunk/arch/sh/include/asm/scatterlist.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_SH_SCATTERLIST_H
-#define __ASM_SH_SCATTERLIST_H
-
-#include <asm-generic/scatterlist.h>
-
-#endif /* __ASM_SH_SCATTERLIST_H */
diff --git a/trunk/arch/sh/include/asm/sizes.h b/trunk/arch/sh/include/asm/sizes.h
deleted file mode 100644
index dd248c2e1085..000000000000
--- a/trunk/arch/sh/include/asm/sizes.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/sizes.h>