From b90f01b6adcaf98c7d53b45c5f6fe02c113be08c Mon Sep 17 00:00:00 2001
From: Paul Mackerras <paulus@samba.org>
Date: Sun, 4 Mar 2012 12:56:55 +0000
Subject: [PATCH] --- yaml --- r: 290543 b: refs/heads/master c:
 4b32da2bcf1de2b7a196a0e48389d231b4472c36 h: refs/heads/master i:   290541:
 1498eeb76d1b3fa75416f3643aa9c2f1fdc91be1   290539:
 733e7ef81c3e50a15f0ed03efca75073fa109379   290535:
 d762e0ea841d2ee1b2798c48a0274b34b6b61ab9   290527:
 91ea47628ac0f4eebb2c999c471c20e595bf20bf v: v3

---
 [refs]                                  | 2 +-
 trunk/Documentation/networking/l2tp.txt | 2 +-
 trunk/drivers/isdn/capi/capi.c          | 2 +-
 trunk/drivers/net/ppp/ppp_async.c       | 2 +-
 trunk/drivers/net/ppp/ppp_synctty.c     | 2 +-
 trunk/drivers/net/ppp/pppoe.c           | 2 +-
 trunk/drivers/net/ppp/pppox.c           | 2 +-
 trunk/drivers/tty/ipwireless/network.c  | 2 +-
 trunk/drivers/tty/ipwireless/tty.c      | 2 +-
 trunk/fs/compat_ioctl.c                 | 2 +-
 trunk/include/linux/isdn.h              | 2 +-
 trunk/net/atm/pppoatm.c                 | 2 +-
 trunk/net/irda/irnet/irnet.h            | 2 +-
 trunk/net/l2tp/l2tp_ppp.c               | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 3071afa43d10..088da6a3f9d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf7daebb9fba540cb8864f435f153678b3e5c171
+refs/heads/master: 4b32da2bcf1de2b7a196a0e48389d231b4472c36
diff --git a/trunk/Documentation/networking/l2tp.txt b/trunk/Documentation/networking/l2tp.txt
index e7bf3979facb..e63fc1f7bf87 100644
--- a/trunk/Documentation/networking/l2tp.txt
+++ b/trunk/Documentation/networking/l2tp.txt
@@ -111,7 +111,7 @@ When creating PPPoL2TP sockets, the application provides information
 to the driver about the socket in a socket connect() call. Source and
 destination tunnel and session ids are provided, as well as the file
 descriptor of a UDP socket. See struct pppol2tp_addr in
-include/linux/if_ppp.h. Note that zero tunnel / session ids are
+include/linux/if_pppol2tp.h. Note that zero tunnel / session ids are
 treated specially. When creating the per-tunnel PPPoL2TP management
 socket in Step 2 above, zero source and destination session ids are
 specified, which tells the driver to prepare the supplied UDP file
diff --git a/trunk/drivers/isdn/capi/capi.c b/trunk/drivers/isdn/capi/capi.c
index d33a70c49180..0cf05464bfb7 100644
--- a/trunk/drivers/isdn/capi/capi.c
+++ b/trunk/drivers/isdn/capi/capi.c
@@ -25,7 +25,7 @@
 #include <linux/tty.h>
 #include <linux/netdevice.h>
 #include <linux/ppp_defs.h>
-#include <linux/if_ppp.h>
+#include <linux/ppp-ioctl.h>
 #include <linux/skbuff.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
diff --git a/trunk/drivers/net/ppp/ppp_async.c b/trunk/drivers/net/ppp/ppp_async.c
index c6ba64380829..af95a98fd86f 100644
--- a/trunk/drivers/net/ppp/ppp_async.c
+++ b/trunk/drivers/net/ppp/ppp_async.c
@@ -26,7 +26,7 @@
 #include <linux/poll.h>
 #include <linux/crc-ccitt.h>
 #include <linux/ppp_defs.h>
-#include <linux/if_ppp.h>
+#include <linux/ppp-ioctl.h>
 #include <linux/ppp_channel.h>
 #include <linux/spinlock.h>
 #include <linux/init.h>
diff --git a/trunk/drivers/net/ppp/ppp_synctty.c b/trunk/drivers/net/ppp/ppp_synctty.c
index 736a39ee05bb..55e466c511d5 100644
--- a/trunk/drivers/net/ppp/ppp_synctty.c
+++ b/trunk/drivers/net/ppp/ppp_synctty.c
@@ -39,7 +39,7 @@
 #include <linux/netdevice.h>
 #include <linux/poll.h>
 #include <linux/ppp_defs.h>
-#include <linux/if_ppp.h>
+#include <linux/ppp-ioctl.h>
 #include <linux/ppp_channel.h>
 #include <linux/spinlock.h>
 #include <linux/completion.h>
diff --git a/trunk/drivers/net/ppp/pppoe.c b/trunk/drivers/net/ppp/pppoe.c
index bc9a4bb31980..2fa1a9b6f498 100644
--- a/trunk/drivers/net/ppp/pppoe.c
+++ b/trunk/drivers/net/ppp/pppoe.c
@@ -72,7 +72,7 @@
 #include <linux/if_pppox.h>
 #include <linux/ppp_channel.h>
 #include <linux/ppp_defs.h>
-#include <linux/if_ppp.h>
+#include <linux/ppp-ioctl.h>
 #include <linux/notifier.h>
 #include <linux/file.h>
 #include <linux/proc_fs.h>
diff --git a/trunk/drivers/net/ppp/pppox.c b/trunk/drivers/net/ppp/pppox.c
index 8c0d170dabcd..2940e9fe351b 100644
--- a/trunk/drivers/net/ppp/pppox.c
+++ b/trunk/drivers/net/ppp/pppox.c
@@ -28,7 +28,7 @@
 #include <linux/init.h>
 #include <linux/if_pppox.h>
 #include <linux/ppp_defs.h>
-#include <linux/if_ppp.h>
+#include <linux/ppp-ioctl.h>
 #include <linux/ppp_channel.h>
 #include <linux/kmod.h>
 
diff --git a/trunk/drivers/tty/ipwireless/network.c b/trunk/drivers/tty/ipwireless/network.c
index f7daeea598e4..57c8b481113f 100644
--- a/trunk/drivers/tty/ipwireless/network.c
+++ b/trunk/drivers/tty/ipwireless/network.c
@@ -22,7 +22,7 @@
 #include <linux/ppp_channel.h>
 #include <linux/ppp_defs.h>
 #include <linux/slab.h>
-#include <linux/if_ppp.h>
+#include <linux/ppp-ioctl.h>
 #include <linux/skbuff.h>
 
 #include "network.h"
diff --git a/trunk/drivers/tty/ipwireless/tty.c b/trunk/drivers/tty/ipwireless/tty.c
index ef92869502a7..2ffa0b77770a 100644
--- a/trunk/drivers/tty/ipwireless/tty.c
+++ b/trunk/drivers/tty/ipwireless/tty.c
@@ -21,7 +21,7 @@
 #include <linux/mutex.h>
 #include <linux/ppp_defs.h>
 #include <linux/if.h>
-#include <linux/if_ppp.h>
+#include <linux/ppp-ioctl.h>
 #include <linux/sched.h>
 #include <linux/serial.h>
 #include <linux/slab.h>
diff --git a/trunk/fs/compat_ioctl.c b/trunk/fs/compat_ioctl.c
index a26bea10e81b..10d8cd90ca6f 100644
--- a/trunk/fs/compat_ioctl.c
+++ b/trunk/fs/compat_ioctl.c
@@ -34,7 +34,7 @@
 #include <linux/fs.h>
 #include <linux/file.h>
 #include <linux/ppp_defs.h>
-#include <linux/if_ppp.h>
+#include <linux/ppp-ioctl.h>
 #include <linux/if_pppox.h>
 #include <linux/mtio.h>
 #include <linux/auto_fs.h>
diff --git a/trunk/include/linux/isdn.h b/trunk/include/linux/isdn.h
index 4ccf95d681b4..292f27a793d4 100644
--- a/trunk/include/linux/isdn.h
+++ b/trunk/include/linux/isdn.h
@@ -187,7 +187,7 @@ typedef struct {
 #endif
 
 #include <linux/ppp_defs.h>
-#include <linux/if_ppp.h>
+#include <linux/ppp-ioctl.h>
 
 #include <linux/isdn_ppp.h>
 #endif
diff --git a/trunk/net/atm/pppoatm.c b/trunk/net/atm/pppoatm.c
index df35d9a3b5fe..614d3fc47ede 100644
--- a/trunk/net/atm/pppoatm.c
+++ b/trunk/net/atm/pppoatm.c
@@ -44,7 +44,7 @@
 #include <linux/atmdev.h>
 #include <linux/capability.h>
 #include <linux/ppp_defs.h>
-#include <linux/if_ppp.h>
+#include <linux/ppp-ioctl.h>
 #include <linux/ppp_channel.h>
 #include <linux/atmppp.h>
 
diff --git a/trunk/net/irda/irnet/irnet.h b/trunk/net/irda/irnet/irnet.h
index 979ecb2435a7..564eb0b8afa3 100644
--- a/trunk/net/irda/irnet/irnet.h
+++ b/trunk/net/irda/irnet/irnet.h
@@ -254,7 +254,7 @@
 #include <linux/init.h>
 
 #include <linux/ppp_defs.h>
-#include <linux/if_ppp.h>
+#include <linux/ppp-ioctl.h>
 #include <linux/ppp_channel.h>
 
 #include <net/irda/irda.h>
diff --git a/trunk/net/l2tp/l2tp_ppp.c b/trunk/net/l2tp/l2tp_ppp.c
index 8a90d756c904..96bc7a67585a 100644
--- a/trunk/net/l2tp/l2tp_ppp.c
+++ b/trunk/net/l2tp/l2tp_ppp.c
@@ -82,7 +82,7 @@
 #include <net/sock.h>
 #include <linux/ppp_channel.h>
 #include <linux/ppp_defs.h>
-#include <linux/if_ppp.h>
+#include <linux/ppp-ioctl.h>
 #include <linux/file.h>
 #include <linux/hash.h>
 #include <linux/sort.h>