diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-19 11:02:02 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-19 11:02:02 -0700 |
commit | 22054fbe7adbdd6db5cc766912ac41ab20b016ef (patch) | |
tree | 82aa8fdb0aca6ca721776d670404d30647c5c903 /arch/parisc/include/uapi/asm/statfs.h | |
parent | ea26d0cff44420052495731af34fcab561d3953a (diff) | |
parent | 6238559f0b709c02f680f584b9a1aaa3eb660d39 (diff) |
Merge tag 'parisc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6
Pull PARISC changes from James Bottomley:
"This is a couple of high code motion patches (all within arch/parisc)
I'd like to apply at -rc1 to avoid conflicts with anything else. One
moves us on to the generated instead of included asm file model and
the other is a pull request from David Howells for UAPI
disintegration.
Signed-off-by: James Bottomley <JBottomley@Parallels.com>"
* tag 'parisc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6:
UAPI: (Scripted) Disintegrate arch/parisc/include/asm
[PARISC] asm: redo generic includes
Diffstat (limited to 'arch/parisc/include/uapi/asm/statfs.h')
-rw-r--r-- | arch/parisc/include/uapi/asm/statfs.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/parisc/include/uapi/asm/statfs.h b/arch/parisc/include/uapi/asm/statfs.h new file mode 100644 index 00000000000..324bea905dc --- /dev/null +++ b/arch/parisc/include/uapi/asm/statfs.h @@ -0,0 +1,7 @@ +#ifndef _PARISC_STATFS_H +#define _PARISC_STATFS_H + +#define __statfs_word long +#include <asm-generic/statfs.h> + +#endif |