diff options
Diffstat (limited to 'arch/m68k')
-rw-r--r-- | arch/m68k/include/asm/Kbuild | 1 | ||||
-rw-r--r-- | arch/m68k/include/asm/types.h | 22 |
2 files changed, 1 insertions, 22 deletions
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild index 4d1f8fa33091..064f86743b34 100644 --- a/arch/m68k/include/asm/Kbuild +++ b/arch/m68k/include/asm/Kbuild | |||
@@ -23,5 +23,6 @@ generic-y += scatterlist.h | |||
23 | generic-y += siginfo.h | 23 | generic-y += siginfo.h |
24 | generic-y += statfs.h | 24 | generic-y += statfs.h |
25 | generic-y += topology.h | 25 | generic-y += topology.h |
26 | generic-y += types.h | ||
26 | generic-y += word-at-a-time.h | 27 | generic-y += word-at-a-time.h |
27 | generic-y += xor.h | 28 | generic-y += xor.h |
diff --git a/arch/m68k/include/asm/types.h b/arch/m68k/include/asm/types.h deleted file mode 100644 index 89705adcbd52..000000000000 --- a/arch/m68k/include/asm/types.h +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | #ifndef _M68K_TYPES_H | ||
2 | #define _M68K_TYPES_H | ||
3 | |||
4 | /* | ||
5 | * This file is never included by application software unless | ||
6 | * explicitly requested (e.g., via linux/types.h) in which case the | ||
7 | * application is Linux specific so (user-) name space pollution is | ||
8 | * not a major issue. However, for interoperability, libraries still | ||
9 | * need to be careful to avoid a name clashes. | ||
10 | */ | ||
11 | #include <asm-generic/int-ll64.h> | ||
12 | |||
13 | /* | ||
14 | * These aren't exported outside the kernel to avoid name space clashes | ||
15 | */ | ||
16 | #ifdef __KERNEL__ | ||
17 | |||
18 | #define BITS_PER_LONG 32 | ||
19 | |||
20 | #endif /* __KERNEL__ */ | ||
21 | |||
22 | #endif /* _M68K_TYPES_H */ | ||