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.

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.
111e2a51 · Linus Torvalds · bced1373 · c8154c8a · 111e2a51
Commit 111e2a51 authored Aug 06, 2007 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

include/asm-sparc/fcntl.h include/asm-sparc/fcntl.h +1 -0

No files found.
--- 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