diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-08-04 03:09:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-08-04 03:09:27 -0400 |
| commit | d7619fe39d9769b4d4545cc511c891deea18ae08 (patch) | |
| tree | 0a902533414001075b2245825e145cc2e35ce985 /drivers/net/wimax | |
| parent | 9ea71503a8ed9184d2d0b8ccc4d269d05f7940ae (diff) | |
| parent | ed8f37370d83e695c0a4fa5d5fc7a83ecb947526 (diff) | |
Merge branch 'linus' into core/urgent
Diffstat (limited to 'drivers/net/wimax')
| -rw-r--r-- | drivers/net/wimax/i2400m/i2400m.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wimax/i2400m/i2400m.h b/drivers/net/wimax/i2400m/i2400m.h index 5eacc653a94d..c421a6141854 100644 --- a/drivers/net/wimax/i2400m/i2400m.h +++ b/drivers/net/wimax/i2400m/i2400m.h | |||
| @@ -155,7 +155,7 @@ | |||
| 155 | #include <linux/netdevice.h> | 155 | #include <linux/netdevice.h> |
| 156 | #include <linux/completion.h> | 156 | #include <linux/completion.h> |
| 157 | #include <linux/rwsem.h> | 157 | #include <linux/rwsem.h> |
| 158 | #include <asm/atomic.h> | 158 | #include <linux/atomic.h> |
| 159 | #include <net/wimax.h> | 159 | #include <net/wimax.h> |
| 160 | #include <linux/wimax/i2400m.h> | 160 | #include <linux/wimax/i2400m.h> |
| 161 | #include <asm/byteorder.h> | 161 | #include <asm/byteorder.h> |