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/net/ppp | |
| 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/net/ppp')
| -rw-r--r-- | drivers/net/ppp/ppp_async.c | 2 | ||||
| -rw-r--r-- | drivers/net/ppp/ppp_synctty.c | 2 | ||||
| -rw-r--r-- | drivers/net/ppp/pppoe.c | 2 | ||||
| -rw-r--r-- | drivers/net/ppp/pppox.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ppp/ppp_async.c b/drivers/net/ppp/ppp_async.c index c6ba6438082..af95a98fd86 100644 --- a/drivers/net/ppp/ppp_async.c +++ b/drivers/net/ppp/ppp_async.c | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | #include <linux/poll.h> | 26 | #include <linux/poll.h> |
| 27 | #include <linux/crc-ccitt.h> | 27 | #include <linux/crc-ccitt.h> |
| 28 | #include <linux/ppp_defs.h> | 28 | #include <linux/ppp_defs.h> |
| 29 | #include <linux/if_ppp.h> | 29 | #include <linux/ppp-ioctl.h> |
| 30 | #include <linux/ppp_channel.h> | 30 | #include <linux/ppp_channel.h> |
| 31 | #include <linux/spinlock.h> | 31 | #include <linux/spinlock.h> |
| 32 | #include <linux/init.h> | 32 | #include <linux/init.h> |
diff --git a/drivers/net/ppp/ppp_synctty.c b/drivers/net/ppp/ppp_synctty.c index 736a39ee05b..55e466c511d 100644 --- a/drivers/net/ppp/ppp_synctty.c +++ b/drivers/net/ppp/ppp_synctty.c | |||
| @@ -39,7 +39,7 @@ | |||
| 39 | #include <linux/netdevice.h> | 39 | #include <linux/netdevice.h> |
| 40 | #include <linux/poll.h> | 40 | #include <linux/poll.h> |
| 41 | #include <linux/ppp_defs.h> | 41 | #include <linux/ppp_defs.h> |
| 42 | #include <linux/if_ppp.h> | 42 | #include <linux/ppp-ioctl.h> |
| 43 | #include <linux/ppp_channel.h> | 43 | #include <linux/ppp_channel.h> |
| 44 | #include <linux/spinlock.h> | 44 | #include <linux/spinlock.h> |
| 45 | #include <linux/completion.h> | 45 | #include <linux/completion.h> |
diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c index bc9a4bb3198..2fa1a9b6f49 100644 --- a/drivers/net/ppp/pppoe.c +++ b/drivers/net/ppp/pppoe.c | |||
| @@ -72,7 +72,7 @@ | |||
| 72 | #include <linux/if_pppox.h> | 72 | #include <linux/if_pppox.h> |
| 73 | #include <linux/ppp_channel.h> | 73 | #include <linux/ppp_channel.h> |
| 74 | #include <linux/ppp_defs.h> | 74 | #include <linux/ppp_defs.h> |
| 75 | #include <linux/if_ppp.h> | 75 | #include <linux/ppp-ioctl.h> |
| 76 | #include <linux/notifier.h> | 76 | #include <linux/notifier.h> |
| 77 | #include <linux/file.h> | 77 | #include <linux/file.h> |
| 78 | #include <linux/proc_fs.h> | 78 | #include <linux/proc_fs.h> |
diff --git a/drivers/net/ppp/pppox.c b/drivers/net/ppp/pppox.c index 8c0d170dabc..2940e9fe351 100644 --- a/drivers/net/ppp/pppox.c +++ b/drivers/net/ppp/pppox.c | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 29 | #include <linux/if_pppox.h> | 29 | #include <linux/if_pppox.h> |
| 30 | #include <linux/ppp_defs.h> | 30 | #include <linux/ppp_defs.h> |
| 31 | #include <linux/if_ppp.h> | 31 | #include <linux/ppp-ioctl.h> |
| 32 | #include <linux/ppp_channel.h> | 32 | #include <linux/ppp_channel.h> |
| 33 | #include <linux/kmod.h> | 33 | #include <linux/kmod.h> |
| 34 | 34 | ||