From f5c12733faafecd901ff57f08785a3622b50f720 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Wed, 24 Aug 2011 18:43:50 +0000
Subject: [PATCH] --- yaml --- r: 265541 b: refs/heads/master c:
 d4b172d2ecb99edfb6afce6af8a65447af347543 h: refs/heads/master i:   265539:
 e8ad9e4129d121605c0781b2c9f7428ee549b814 v: v3

---
 [refs]                            | 2 +-
 trunk/include/linux/if_pppol2tp.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 53d95b3c6fb5..ba3f3e5b89b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2e0cd88691f214fdeacb63bbd823703456a1617
+refs/heads/master: d4b172d2ecb99edfb6afce6af8a65447af347543
diff --git a/trunk/include/linux/if_pppol2tp.h b/trunk/include/linux/if_pppol2tp.h
index 184bc5566207..23cefa1111bf 100644
--- a/trunk/include/linux/if_pppol2tp.h
+++ b/trunk/include/linux/if_pppol2tp.h
@@ -39,7 +39,7 @@ struct pppol2tp_addr {
  * bits. So we need a different sockaddr structure.
  */
 struct pppol2tpv3_addr {
-	pid_t	pid;			/* pid that owns the fd.
+	__kernel_pid_t	pid;		/* pid that owns the fd.
 					 * 0 => current */
 	int	fd;			/* FD of UDP or IP socket to use */