From 7d25d55cf721655b0d6150dc7d620866abd984ff Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Wed, 30 May 2012 19:50:04 +0200 Subject: [PATCH] --- yaml --- r: 321294 b: refs/heads/master c: 2ef0d3e64f0ba9aed72c2ddd410aea83cd3261ab h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/m68k/include/asm/Kbuild | 1 + trunk/arch/m68k/include/asm/types.h | 22 ---------------------- 3 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 trunk/arch/m68k/include/asm/types.h diff --git a/[refs] b/[refs] index d68cac895e95..4993bf09e064 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2bbc89a8e9c652ee71c6c3b2e0679b7ecedb1a09 +refs/heads/master: 2ef0d3e64f0ba9aed72c2ddd410aea83cd3261ab diff --git a/trunk/arch/m68k/include/asm/Kbuild b/trunk/arch/m68k/include/asm/Kbuild index 4d1f8fa33091..064f86743b34 100644 --- a/trunk/arch/m68k/include/asm/Kbuild +++ b/trunk/arch/m68k/include/asm/Kbuild @@ -23,5 +23,6 @@ generic-y += scatterlist.h generic-y += siginfo.h generic-y += statfs.h generic-y += topology.h +generic-y += types.h generic-y += word-at-a-time.h generic-y += xor.h diff --git a/trunk/arch/m68k/include/asm/types.h b/trunk/arch/m68k/include/asm/types.h deleted file mode 100644 index 89705adcbd52..000000000000 --- a/trunk/arch/m68k/include/asm/types.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef _M68K_TYPES_H -#define _M68K_TYPES_H - -/* - * This file is never included by application software unless - * explicitly requested (e.g., via linux/types.h) in which case the - * application is Linux specific so (user-) name space pollution is - * not a major issue. However, for interoperability, libraries still - * need to be careful to avoid a name clashes. - */ -#include - -/* - * These aren't exported outside the kernel to avoid name space clashes - */ -#ifdef __KERNEL__ - -#define BITS_PER_LONG 32 - -#endif /* __KERNEL__ */ - -#endif /* _M68K_TYPES_H */