diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-06 20:52:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-06 20:52:42 -0400 |
| commit | 111e2a513bac77d317011350f34f9cc30deb9806 (patch) | |
| tree | cc5e0f4d231ee5b7502a0a20958755af49703650 /include | |
| parent | bced13738405b62c8203df9c103d4ba63d747872 (diff) | |
| parent | c8154c8a9aaf548ad91e413da8b319858e37bc52 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC32]: Fix build.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc/fcntl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-sparc/fcntl.h b/include/asm-sparc/fcntl.h index 7bbdfc77accd..5ec546349fc8 100644 --- a/include/asm-sparc/fcntl.h +++ b/include/asm-sparc/fcntl.h | |||
| @@ -32,5 +32,6 @@ | |||
| 32 | #define __ARCH_FLOCK_PAD short __unused; | 32 | #define __ARCH_FLOCK_PAD short __unused; |
| 33 | #define __ARCH_FLOCK64_PAD short __unused; | 33 | #define __ARCH_FLOCK64_PAD short __unused; |
| 34 | 34 | ||
| 35 | #include <asm-generic/fcntl.h> | ||
| 35 | 36 | ||
| 36 | #endif | 37 | #endif |