TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Browse Source 
Conflicts:

	include/linux/nfs_fs.h

Fixed up conflict with kernel header updates.
This commit is contained in:
Trond Myklebust
2006-06-20 20:46:21 -04:00
parent d59bf96cdd 077e98945d
commit 70ac4385a1
1170 changed files with 25359 additions and 10569 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/nfs4.h
View File

@@ -14,7 +14,6 @@
#define _LINUX_NFS4_H
#include <linux/types.h>
#include <linux/list.h>
#define NFS4_VERIFIER_SIZE 8
#define NFS4_FHSIZE 128
@@ -97,6 +96,9 @@ enum nfs4_acl_whotype {
NFS4_ACL_WHO_EVERYONE,
};
#ifdef __KERNEL__
#include <linux/list.h>
struct nfs4_ace {
uint32_t type;
uint32_t flag;
@@ -345,8 +347,6 @@ enum lock_type4 {
#define NFS4_MINOR_VERSION 0
#define NFS4_DEBUG 1
#ifdef __KERNEL__
/* Index of predefined Linux client operations */
enum {