Skip to content

Commit

Permalink
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/…
Browse files Browse the repository at this point in the history
…davem/sparc-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC32]: Fix build.
  • Loading branch information
Linus Torvalds committed Aug 7, 2007
2 parents bced137 + c8154c8 commit 111e2a5
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions include/asm-sparc/fcntl.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,6 @@
#define __ARCH_FLOCK_PAD short __unused;
#define __ARCH_FLOCK64_PAD short __unused;

#include <asm-generic/fcntl.h>

#endif

0 comments on commit 111e2a5

Please sign in to comment.