diff options
| author | David S. Miller | 2008-06-10 11:22:26 +0200 |
|---|---|---|
| committer | David S. Miller | 2008-06-10 11:22:26 +0200 |
| commit | 65b53e4cc90e59936733b3b95b9451d2ca47528d (patch) | |
| tree | 29932718192962671c48c3fd1ea017a6112459e8 /drivers/net/wireless/atmel.c | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville... (diff) | |
| parent | ipv6 netns: init net is used to set bindv6only for new sock (diff) | |
| download | kernel-qcow2-linux-65b53e4cc90e59936733b3b95b9451d2ca47528d.tar.gz kernel-qcow2-linux-65b53e4cc90e59936733b3b95b9451d2ca47528d.tar.xz kernel-qcow2-linux-65b53e4cc90e59936733b3b95b9451d2ca47528d.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tg3.c
drivers/net/wireless/rt2x00/rt2x00dev.c
net/mac80211/ieee80211_i.h
Diffstat (limited to 'drivers/net/wireless/atmel.c')
| -rw-r--r-- | drivers/net/wireless/atmel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c index f978a9d5190b..7bb2646ae0ef 100644 --- a/drivers/net/wireless/atmel.c +++ b/drivers/net/wireless/atmel.c @@ -47,6 +47,7 @@ #include <linux/string.h> #include <linux/ctype.h> #include <linux/timer.h> +#include <asm/byteorder.h> #include <asm/io.h> #include <asm/system.h> #include <asm/uaccess.h> @@ -60,7 +61,6 @@ #include <linux/delay.h> #include <linux/wireless.h> #include <net/iw_handler.h> -#include <linux/byteorder/generic.h> #include <linux/crc32.h> #include <linux/proc_fs.h> #include <linux/device.h> |