Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · 111e2a513b - Gogs

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.

Linus Torvalds 18 years ago

parent

bced137384 c8154c8a9a

commit

111e2a513b

1 changed files with 1 additions and 0 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 0
						
include/asm-sparc/fcntl.h
							 
								View File
							
				@@ -32,5 +32,6 @@
			
				 #define __ARCH_FLOCK_PAD	short __unused;
			
				 #define __ARCH_FLOCK64_PAD	short __unused;
			
				+#include <asm-generic/fcntl.h>
			
				 #endif