diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-18 10:10:36 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-18 10:10:36 -0800 |
commit | 3d9de1909b339f967f1b37367df233a0dcfc10cf (patch) | |
tree | b2360a9ac142e15007ebe0fabf0365b9d4cd8b65 /arch/alpha/include/uapi/asm/types.h | |
parent | 9a8a5702c5a7298c0edd125464aa178dd8b50440 (diff) | |
parent | 96433f6ee49032d7a8bda76de2b05cfde2914354 (diff) | |
download | op-kernel-dev-3d9de1909b339f967f1b37367df233a0dcfc10cf.zip op-kernel-dev-3d9de1909b339f967f1b37367df233a0dcfc10cf.tar.gz |
Merge tag 'disintegrate-alpha-20121217' of git://git.infradead.org/users/dhowells/linux-headers
Pull UAPI disintegration for Alpha from David Howells:
"I've been asked to send the Alpha UAPI disintegration to you directly.
The acks I have been given have been added into the patch."
* tag 'disintegrate-alpha-20121217' of git://git.infradead.org/users/dhowells/linux-headers:
UAPI: (Scripted) Disintegrate arch/alpha/include/asm
Diffstat (limited to 'arch/alpha/include/uapi/asm/types.h')
-rw-r--r-- | arch/alpha/include/uapi/asm/types.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/alpha/include/uapi/asm/types.h b/arch/alpha/include/uapi/asm/types.h new file mode 100644 index 0000000..9fd3cd4 --- /dev/null +++ b/arch/alpha/include/uapi/asm/types.h @@ -0,0 +1,16 @@ +#ifndef _UAPI_ALPHA_TYPES_H +#define _UAPI_ALPHA_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. + */ + +#ifndef __KERNEL__ +#include <asm-generic/int-l64.h> +#endif + +#endif /* _UAPI_ALPHA_TYPES_H */ |