lkml.org 
[lkml]   [2015]   [May]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 8/8] CRIS: UAPI: use generic types.h
Date
CRIS' types.h is functionally identical to the asm-generic version.

Effective diff:

@@ -1 +1,6 @@
+#ifndef _ASM_GENERIC_TYPES_H
+#define _ASM_GENERIC_TYPES_H
+
#include <asm-generic/int-ll64.h>
+
+#endif

Signed-off-by: Rabin Vincent <rabin@rab.in>
---
arch/cris/include/asm/Kbuild | 1 +
arch/cris/include/asm/types.h | 12 ------------
arch/cris/include/uapi/asm/types.h | 1 -
3 files changed, 1 insertion(+), 13 deletions(-)
delete mode 100644 arch/cris/include/asm/types.h
delete mode 100644 arch/cris/include/uapi/asm/types.h

diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild
index db6cbc9..2fc4331 100644
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@ -41,5 +41,6 @@ generic-y += sockios.h
generic-y += statfs.h
generic-y += topology.h
generic-y += trace_clock.h
+generic-y += types.h
generic-y += vga.h
generic-y += xor.h
diff --git a/arch/cris/include/asm/types.h b/arch/cris/include/asm/types.h
deleted file mode 100644
index a3cac77..0000000
--- a/arch/cris/include/asm/types.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _ETRAX_TYPES_H
-#define _ETRAX_TYPES_H
-
-#include <uapi/asm/types.h>
-
-/*
- * These aren't exported outside the kernel to avoid name space clashes
- */
-
-#define BITS_PER_LONG 32
-
-#endif
diff --git a/arch/cris/include/uapi/asm/types.h b/arch/cris/include/uapi/asm/types.h
deleted file mode 100644
index 9ec9d4c..0000000
--- a/arch/cris/include/uapi/asm/types.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/int-ll64.h>
--
2.1.4


\
 
 \ /
  Last update: 2015-05-14 18:01    [W:0.080 / U:0.696 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site