diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-10-30 07:35:11 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-10-30 07:35:11 -0400 |
| commit | 67577927e8d7a1f4b09b4992df640eadc6aacb36 (patch) | |
| tree | 2e9efe6b5745965faf0dcc084d4613d9356263f9 /include/asm-generic/fcntl.h | |
| parent | 6fe4c590313133ebd5dadb769031489ff178ece1 (diff) | |
| parent | 51f00a471ce8f359627dd99aeac322947a0e491b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Conflicts:
drivers/mtd/mtd_blkdevs.c
Merge Grant's device-tree bits so that we can apply the subsequent fixes.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'include/asm-generic/fcntl.h')
| -rw-r--r-- | include/asm-generic/fcntl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/fcntl.h b/include/asm-generic/fcntl.h index a70b2d2bfc1..0fc16e3f0bf 100644 --- a/include/asm-generic/fcntl.h +++ b/include/asm-generic/fcntl.h | |||
| @@ -122,7 +122,7 @@ | |||
| 122 | 122 | ||
| 123 | struct f_owner_ex { | 123 | struct f_owner_ex { |
| 124 | int type; | 124 | int type; |
| 125 | pid_t pid; | 125 | __kernel_pid_t pid; |
| 126 | }; | 126 | }; |
| 127 | 127 | ||
| 128 | /* for F_[GET|SET]FL */ | 128 | /* for F_[GET|SET]FL */ |