diff options
| author | Paul Mackerras <paulus@samba.org> | 2012-03-04 12:56:55 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-04 20:41:38 -0500 |
| commit | 4b32da2bcf1de2b7a196a0e48389d231b4472c36 (patch) | |
| tree | 440b246f9fffb1126ceab28d7aa4c55c59187e11 /net | |
| parent | bf7daebb9fba540cb8864f435f153678b3e5c171 (diff) | |
| download | op-kernel-dev-4b32da2bcf1de2b7a196a0e48389d231b4472c36.zip op-kernel-dev-4b32da2bcf1de2b7a196a0e48389d231b4472c36.tar.gz | |
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.c | 2 | ||||
| -rw-r--r-- | net/irda/irnet/irnet.h | 2 | ||||
| -rw-r--r-- | net/l2tp/l2tp_ppp.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/net/atm/pppoatm.c b/net/atm/pppoatm.c index df35d9a..614d3fc 100644 --- a/net/atm/pppoatm.c +++ b/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/net/irda/irnet/irnet.h b/net/irda/irnet/irnet.h index 979ecb2..564eb0b 100644 --- a/net/irda/irnet/irnet.h +++ b/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/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c index 8a90d75..96bc7a6 100644 --- a/net/l2tp/l2tp_ppp.c +++ b/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> |
