mirror of
https://github.com/torvalds/linux.git
synced 2024-12-25 12:21:37 +00:00
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.
This commit is contained in:
commit
111e2a513b
@ -32,5 +32,6 @@
|
||||
#define __ARCH_FLOCK_PAD short __unused;
|
||||
#define __ARCH_FLOCK64_PAD short __unused;
|
||||
|
||||
#include <asm-generic/fcntl.h>
|
||||
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user