aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2012-03-04 07:56:55 -0500
committerDavid S. Miller <davem@davemloft.net>2012-03-04 20:41:38 -0500
commit4b32da2bcf1de2b7a196a0e48389d231b4472c36 (patch)
tree440b246f9fffb1126ceab28d7aa4c55c59187e11 /net
parentbf7daebb9fba540cb8864f435f153678b3e5c171 (diff)
ppp: Replace uses of <linux/if_ppp.h> with <linux/ppp-ioctl.h>
Since all that include/linux/if_ppp.h does is #include <linux/ppp-ioctl.h>, this replaces the occurrences of #include <linux/if_ppp.h> with #include <linux/ppp-ioctl.h>. It also corrects an error in Documentation/networking/l2tp.txt, where it referenced include/linux/if_ppp.h as the source of some definitions that are actually now defined in include/linux/if_pppol2tp.h. Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/atm/pppoatm.c2
-rw-r--r--net/irda/irnet/irnet.h2
-rw-r--r--net/l2tp/l2tp_ppp.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/net/atm/pppoatm.c b/net/atm/pppoatm.c
index df35d9a3b5fe..614d3fc47ede 100644
--- a/net/atm/pppoatm.c
+++ b/net/atm/pppoatm.c
@@ -44,7 +44,7 @@
44#include <linux/atmdev.h> 44#include <linux/atmdev.h>
45#include <linux/capability.h> 45#include <linux/capability.h>
46#include <linux/ppp_defs.h> 46#include <linux/ppp_defs.h>
47#include <linux/if_ppp.h> 47#include <linux/ppp-ioctl.h>
48#include <linux/ppp_channel.h> 48#include <linux/ppp_channel.h>
49#include <linux/atmppp.h> 49#include <linux/atmppp.h>
50 50
diff --git a/net/irda/irnet/irnet.h b/net/irda/irnet/irnet.h
index 979ecb2435a7..564eb0b8afa3 100644
--- a/net/irda/irnet/irnet.h
+++ b/net/irda/irnet/irnet.h
@@ -254,7 +254,7 @@
254#include <linux/init.h> 254#include <linux/init.h>
255 255
256#include <linux/ppp_defs.h> 256#include <linux/ppp_defs.h>
257#include <linux/if_ppp.h> 257#include <linux/ppp-ioctl.h>
258#include <linux/ppp_channel.h> 258#include <linux/ppp_channel.h>
259 259
260#include <net/irda/irda.h> 260#include <net/irda/irda.h>
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c
index 8a90d756c904..96bc7a67585a 100644
--- a/net/l2tp/l2tp_ppp.c
+++ b/net/l2tp/l2tp_ppp.c
@@ -82,7 +82,7 @@
82#include <net/sock.h> 82#include <net/sock.h>
83#include <linux/ppp_channel.h> 83#include <linux/ppp_channel.h>
84#include <linux/ppp_defs.h> 84#include <linux/ppp_defs.h>
85#include <linux/if_ppp.h> 85#include <linux/ppp-ioctl.h>
86#include <linux/file.h> 86#include <linux/file.h>
87#include <linux/hash.h> 87#include <linux/hash.h>
88#include <linux/sort.h> 88#include <linux/sort.h>