diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
| commit | 9ff9a26b786c35ee8d2a66222924a807ec851a9f (patch) | |
| tree | db432a17bccca1ca2c16907f0ee83ac449ed4012 /include/linux/xfrm.h | |
| parent | 0a3108beea9143225119d5e7c72a8e2c64f3eb7d (diff) | |
| parent | 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b (diff) | |
Merge commit 'origin/master' into next
Manual merge of:
arch/powerpc/include/asm/elf.h
drivers/i2c/busses/i2c-mpc.c
Diffstat (limited to 'include/linux/xfrm.h')
| -rw-r--r-- | include/linux/xfrm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h index 52f3abd453a1..2d4ec15abaca 100644 --- a/include/linux/xfrm.h +++ b/include/linux/xfrm.h | |||
| @@ -58,7 +58,7 @@ struct xfrm_selector | |||
| 58 | __u8 prefixlen_s; | 58 | __u8 prefixlen_s; |
| 59 | __u8 proto; | 59 | __u8 proto; |
| 60 | int ifindex; | 60 | int ifindex; |
| 61 | uid_t user; | 61 | __kernel_uid32_t user; |
| 62 | }; | 62 | }; |
| 63 | 63 | ||
| 64 | #define XFRM_INF (~(__u64)0) | 64 | #define XFRM_INF (~(__u64)0) |