diff options
author | Paul Mackerras <paulus@samba.org> | 2012-03-04 07:56:55 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-03-04 20:41:38 -0500 |
commit | 4b32da2bcf1de2b7a196a0e48389d231b4472c36 (patch) | |
tree | 440b246f9fffb1126ceab28d7aa4c55c59187e11 /drivers/tty/ipwireless | |
parent | bf7daebb9fba540cb8864f435f153678b3e5c171 (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 'drivers/tty/ipwireless')
-rw-r--r-- | drivers/tty/ipwireless/network.c | 2 | ||||
-rw-r--r-- | drivers/tty/ipwireless/tty.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/ipwireless/network.c b/drivers/tty/ipwireless/network.c index f7daeea598e4..57c8b481113f 100644 --- a/drivers/tty/ipwireless/network.c +++ b/drivers/tty/ipwireless/network.c | |||
@@ -22,7 +22,7 @@ | |||
22 | #include <linux/ppp_channel.h> | 22 | #include <linux/ppp_channel.h> |
23 | #include <linux/ppp_defs.h> | 23 | #include <linux/ppp_defs.h> |
24 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
25 | #include <linux/if_ppp.h> | 25 | #include <linux/ppp-ioctl.h> |
26 | #include <linux/skbuff.h> | 26 | #include <linux/skbuff.h> |
27 | 27 | ||
28 | #include "network.h" | 28 | #include "network.h" |
diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c index ef92869502a7..2ffa0b77770a 100644 --- a/drivers/tty/ipwireless/tty.c +++ b/drivers/tty/ipwireless/tty.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include <linux/mutex.h> | 21 | #include <linux/mutex.h> |
22 | #include <linux/ppp_defs.h> | 22 | #include <linux/ppp_defs.h> |
23 | #include <linux/if.h> | 23 | #include <linux/if.h> |
24 | #include <linux/if_ppp.h> | 24 | #include <linux/ppp-ioctl.h> |
25 | #include <linux/sched.h> | 25 | #include <linux/sched.h> |
26 | #include <linux/serial.h> | 26 | #include <linux/serial.h> |
27 | #include <linux/slab.h> | 27 | #include <linux/slab.h> |