Delete headers which do nothing but include the asm-generic versions and
use Kbuild magic instead.
Signed-off-by: Rabin Vincent
---
arch/cris/include/asm/Kbuild | 12
arch/cris/include/asm/device.h| 7 ---
arch/cris/include/asm/div64.h | 1 -
arch/cris/include/asm/emergency-restart.h | 6 --
arch/cris/include/asm/futex.h | 6 --
arch/cris/include/asm/hardirq.h | 7 ---
arch/cris/include/asm/irq_regs.h | 1 -
arch/cris/include/asm/kdebug.h| 1 -
arch/cris/include/asm/kmap_types.h| 10 --
arch/cris/include/asm/local.h | 1 -
arch/cris/include/asm/local64.h | 1 -
arch/cris/include/asm/percpu.h| 6 --
arch/cris/include/asm/topology.h | 6 --
13 files changed, 12 insertions(+), 53 deletions(-)
delete mode 100644 arch/cris/include/asm/device.h
delete mode 100644 arch/cris/include/asm/div64.h
delete mode 100644 arch/cris/include/asm/emergency-restart.h
delete mode 100644 arch/cris/include/asm/futex.h
delete mode 100644 arch/cris/include/asm/hardirq.h
delete mode 100644 arch/cris/include/asm/irq_regs.h
delete mode 100644 arch/cris/include/asm/kdebug.h
delete mode 100644 arch/cris/include/asm/kmap_types.h
delete mode 100644 arch/cris/include/asm/local.h
delete mode 100644 arch/cris/include/asm/local64.h
delete mode 100644 arch/cris/include/asm/percpu.h
delete mode 100644 arch/cris/include/asm/topology.h
diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild
index e189931..057e518 100644
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@ -3,15 +3,27 @@ generic-y += barrier.h
generic-y += clkdev.h
generic-y += cmpxchg.h
generic-y += cputime.h
+generic-y += device.h
+generic-y += div64.h
generic-y += exec.h
+generic-y += emergency-restart.h
+generic-y += futex.h
+generic-y += hardirq.h
+generic-y += irq_regs.h
generic-y += irq_work.h
+generic-y += kdebug.h
+generic-y += kmap_types.h
generic-y += kvm_para.h
generic-y += linkage.h
+generic-y += local.h
+generic-y += local64.h
generic-y += mcs_spinlock.h
generic-y += module.h
+generic-y += percpu.h
generic-y += preempt.h
generic-y += scatterlist.h
generic-y += sections.h
+generic-y += topology.h
generic-y += trace_clock.h
generic-y += vga.h
generic-y += xor.h
diff --git a/arch/cris/include/asm/device.h b/arch/cris/include/asm/device.h
deleted file mode 100644
index d8f9872..000
--- a/arch/cris/include/asm/device.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Arch specific extensions to struct device
- *
- * This file is released under the GPLv2
- */
-#include
-
diff --git a/arch/cris/include/asm/div64.h b/arch/cris/include/asm/div64.h
deleted file mode 100644
index 6cd978c..000
--- a/arch/cris/include/asm/div64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/arch/cris/include/asm/emergency-restart.h
b/arch/cris/include/asm/emergency-restart.h
deleted file mode 100644
index 108d8c4..000
--- a/arch/cris/include/asm/emergency-restart.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_EMERGENCY_RESTART_H
-#define _ASM_EMERGENCY_RESTART_H
-
-#include
-
-#endif /* _ASM_EMERGENCY_RESTART_H */
diff --git a/arch/cris/include/asm/futex.h b/arch/cris/include/asm/futex.h
deleted file mode 100644
index 6a332a9..000
--- a/arch/cris/include/asm/futex.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_FUTEX_H
-#define _ASM_FUTEX_H
-
-#include
-
-#endif
diff --git a/arch/cris/include/asm/hardirq.h b/arch/cris/include/asm/hardirq.h
deleted file mode 100644
index 04126f7..000
--- a/arch/cris/include/asm/hardirq.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __ASM_HARDIRQ_H
-#define __ASM_HARDIRQ_H
-
-#include
-#include
-
-#endif /* __ASM_HARDIRQ_H */
diff --git a/arch/cris/include/asm/irq_regs.h b/arch/cris/include/asm/irq_regs.h
deleted file mode 100644
index 3dd9c0b..000
--- a/arch/cris/include/asm/irq_regs.h
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/arch/cris/include/asm/kdebug.h b/arch/cris/include/asm/kdebug.h
deleted file mode 100644
index 6ece1b0..000
--- a/arch/cris/include/asm/kdebug.h
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/arch/cris/include/asm/kmap_types.h
b/arch/cris/include/asm/kmap_types.h
deleted file mode 100644
index d2d643c..000
--- a/arch/cris/include/asm/kmap_types.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _ASM_KMAP_TYPES_H
-#define _ASM_KMAP_TYPES_H
-
-/* Dummy header just to define km_type. None of this
- * is actually used on cris.
- */
-
-#include
-
-#endif
diff --git a/arch/cris/include/asm/local.h b/arch/cris/include/asm/local.h
deleted file mode 100644
index c11c530..000
--- a/arch/cris/include/asm/local.h
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/arch/cris/include/asm/local64.h b/arch/cris/include/asm/local64.h
deleted file mode 100644
index 36c93b5..000
--- a/arch/cris/include/asm/local64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include
diff --git a/
