diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-12 21:38:34 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-12 21:38:34 -0400 |
| commit | 0c4a479bdf7c0cf3fa1610b25e0c4ddd5b58713e (patch) | |
| tree | 4d1f97d241b692ad8f7aeca9c5b773fbabfae258 /arch/ia64/include/uapi/asm/resource.h | |
| parent | ade0899b298ba2c43bfd6abd8cbc2545944cde0c (diff) | |
| parent | d536e0db2433686238ec97c517e4fc691000ee6f (diff) | |
Merge tag 'please-pull-dhowells-uapi' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 UAPI changes from Tony Luck:
"ia64 pieces of David Howells great UAPI include file move"
* tag 'please-pull-dhowells-uapi' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
UAPI: (Scripted) Disintegrate arch/ia64/include/asm
Diffstat (limited to 'arch/ia64/include/uapi/asm/resource.h')
| -rw-r--r-- | arch/ia64/include/uapi/asm/resource.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/ia64/include/uapi/asm/resource.h b/arch/ia64/include/uapi/asm/resource.h new file mode 100644 index 000000000000..ba2272a87fc7 --- /dev/null +++ b/arch/ia64/include/uapi/asm/resource.h | |||
| @@ -0,0 +1,7 @@ | |||
| 1 | #ifndef _ASM_IA64_RESOURCE_H | ||
| 2 | #define _ASM_IA64_RESOURCE_H | ||
| 3 | |||
| 4 | #include <asm/ustack.h> | ||
| 5 | #include <asm-generic/resource.h> | ||
| 6 | |||
| 7 | #endif /* _ASM_IA64_RESOURCE_H */ | ||