Skip to content

Commit

Permalink
m68k: types: use <asm-generic/int-*.h> for the m68k architecture
Browse files Browse the repository at this point in the history
This modifies <asm-m68k/types.h> to use the <asm-generic/int-*.h>
generic include files.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
  • Loading branch information
H. Peter Anvin committed May 2, 2008
1 parent ff704db commit ad55ed6
Showing 1 changed file with 1 addition and 31 deletions.
32 changes: 1 addition & 31 deletions include/asm-m68k/types.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,12 @@
* not a major issue. However, for interoperability, libraries still
* need to be careful to avoid a name clashes.
*/
#include <asm-generic/int-ll64.h>

#ifndef __ASSEMBLY__

typedef unsigned short umode_t;

/*
* __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
* header files exported to user space
*/

typedef __signed__ char __s8;
typedef unsigned char __u8;

typedef __signed__ short __s16;
typedef unsigned short __u16;

typedef __signed__ int __s32;
typedef unsigned int __u32;

#if defined(__GNUC__)
__extension__ typedef __signed__ long long __s64;
__extension__ typedef unsigned long long __u64;
#endif

#endif /* __ASSEMBLY__ */

/*
Expand All @@ -43,18 +25,6 @@ __extension__ typedef unsigned long long __u64;

#ifndef __ASSEMBLY__

typedef signed char s8;
typedef unsigned char u8;

typedef signed short s16;
typedef unsigned short u16;

typedef signed int s32;
typedef unsigned int u32;

typedef signed long long s64;
typedef unsigned long long u64;

/* DMA addresses are always 32-bits wide */

typedef u32 dma_addr_t;
Expand Down

0 comments on commit ad55ed6

Please sign in to comment.