summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-07 02:52:42 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-07 02:52:42 +0200
commit111e2a513bac77d317011350f34f9cc30deb9806 (patch)
treecc5e0f4d231ee5b7502a0a20958755af49703650
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 (diff)
parent[SPARC32]: Fix build. (diff)
downloadlinux-111e2a513bac77d317011350f34f9cc30deb9806.tar.xz
linux-111e2a513bac77d317011350f34f9cc30deb9806.zip
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.
-rw-r--r--include/asm-sparc/fcntl.h1
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 @@
#define __ARCH_FLOCK_PAD short __unused;
#define __ARCH_FLOCK64_PAD short __unused;
+#include <asm-generic/fcntl.h>
#endif