diff options
| author | Jeff Garzik <jeff@garzik.org> | 2008-08-07 04:05:46 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-08-07 04:05:46 -0400 |
| commit | 3859069bc3358772b08bd91efe9edec39a746ea8 (patch) | |
| tree | 9ffe71711dd98cf511ad21d9990c597de0ac3b2b /drivers/net/wan/hdlc_raw.c | |
| parent | e2c709b0ba2886b5438b666222b4b3faf82d65a9 (diff) | |
| parent | 867240f7b2a37b1be4ba37d904a9064a96c82099 (diff) | |
| download | op-kernel-dev-3859069bc3358772b08bd91efe9edec39a746ea8.zip op-kernel-dev-3859069bc3358772b08bd91efe9edec39a746ea8.tar.gz | |
Merge branch 'for-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into tmp
Diffstat (limited to 'drivers/net/wan/hdlc_raw.c')
| -rw-r--r-- | drivers/net/wan/hdlc_raw.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/net/wan/hdlc_raw.c b/drivers/net/wan/hdlc_raw.c index bbbb819..8612311 100644 --- a/drivers/net/wan/hdlc_raw.c +++ b/drivers/net/wan/hdlc_raw.c @@ -9,19 +9,18 @@ * as published by the Free Software Foundation. */ -#include <linux/module.h> -#include <linux/kernel.h> -#include <linux/slab.h> -#include <linux/poll.h> #include <linux/errno.h> +#include <linux/hdlc.h> #include <linux/if_arp.h> +#include <linux/inetdevice.h> #include <linux/init.h> -#include <linux/skbuff.h> +#include <linux/kernel.h> +#include <linux/module.h> #include <linux/pkt_sched.h> -#include <linux/inetdevice.h> -#include <linux/lapb.h> +#include <linux/poll.h> #include <linux/rtnetlink.h> -#include <linux/hdlc.h> +#include <linux/skbuff.h> +#include <linux/slab.h> static int raw_ioctl(struct net_device *dev, struct ifreq *ifr); |
