diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:32:01 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:32:01 -0400 |
| commit | da7878d75b8520c9ae00d27dfbbce546a7bfdfbb (patch) | |
| tree | 547fd497a80818a60ac36831377d5df97868173c /drivers/net/wireless/atmel.c | |
| parent | 0e50a4c6ab94ffe7e5515b86b5df9e5abc8c6b13 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into x86/pebs
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 ef2da4023d68..438e63ecccf1 100644 --- a/drivers/net/wireless/atmel.c +++ b/drivers/net/wireless/atmel.c | |||
| @@ -47,6 +47,7 @@ | |||
| 47 | #include <linux/string.h> | 47 | #include <linux/string.h> |
| 48 | #include <linux/ctype.h> | 48 | #include <linux/ctype.h> |
| 49 | #include <linux/timer.h> | 49 | #include <linux/timer.h> |
| 50 | #include <asm/byteorder.h> | ||
| 50 | #include <asm/io.h> | 51 | #include <asm/io.h> |
| 51 | #include <asm/system.h> | 52 | #include <asm/system.h> |
| 52 | #include <asm/uaccess.h> | 53 | #include <asm/uaccess.h> |
| @@ -60,7 +61,6 @@ | |||
| 60 | #include <linux/delay.h> | 61 | #include <linux/delay.h> |
| 61 | #include <linux/wireless.h> | 62 | #include <linux/wireless.h> |
| 62 | #include <net/iw_handler.h> | 63 | #include <net/iw_handler.h> |
| 63 | #include <linux/byteorder/generic.h> | ||
| 64 | #include <linux/crc32.h> | 64 | #include <linux/crc32.h> |
| 65 | #include <linux/proc_fs.h> | 65 | #include <linux/proc_fs.h> |
| 66 | #include <linux/device.h> | 66 | #include <linux/device.h> |