Commit 111e2a51 authored Aug 06, 2007 by Linus Torvalds

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.

include/asm-sparc/fcntl.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -32,5 +32,6 @@
		#define __ARCH_FLOCK_PAD short __unused;
		#define __ARCH_FLOCK64_PAD short __unused;

		#include <asm-generic/fcntl.h>

		#endif