projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...
[firefly-linux-kernel-4.4.55.git]
/
include
/
asm-sparc
/
fcntl.h
diff --git
a/include/asm-sparc/fcntl.h
b/include/asm-sparc/fcntl.h
index 7bbdfc77accd61ff48d2ed9c426b9ec71eb695d3..07bd2d80257fa83134346a20280bdeb3186bb753 100644
(file)
--- a/
include/asm-sparc/fcntl.h
+++ b/
include/asm-sparc/fcntl.h
@@
-1,4
+1,3
@@
-/* $Id: fcntl.h,v 1.16 2001/09/20 00:35:33 davem Exp $ */
#ifndef _SPARC_FCNTL_H
#define _SPARC_FCNTL_H
@@
-32,5
+31,6
@@
#define __ARCH_FLOCK_PAD short __unused;
#define __ARCH_FLOCK64_PAD short __unused;
+#include <asm-generic/fcntl.h>
#endif