diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /drivers/net/wireless/airport.c | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'drivers/net/wireless/airport.c')
| -rw-r--r-- | drivers/net/wireless/airport.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/drivers/net/wireless/airport.c b/drivers/net/wireless/airport.c index 9d496703c465..7b321f7cf358 100644 --- a/drivers/net/wireless/airport.c +++ b/drivers/net/wireless/airport.c | |||
| @@ -15,28 +15,11 @@ | |||
| 15 | #define PFX DRIVER_NAME ": " | 15 | #define PFX DRIVER_NAME ": " |
| 16 | 16 | ||
| 17 | #include <linux/config.h> | 17 | #include <linux/config.h> |
| 18 | |||
| 19 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 22 | #include <linux/ptrace.h> | 21 | #include <linux/delay.h> |
| 23 | #include <linux/slab.h> | ||
| 24 | #include <linux/string.h> | ||
| 25 | #include <linux/timer.h> | ||
| 26 | #include <linux/ioport.h> | ||
| 27 | #include <linux/netdevice.h> | ||
| 28 | #include <linux/if_arp.h> | ||
| 29 | #include <linux/etherdevice.h> | ||
| 30 | #include <linux/wireless.h> | ||
| 31 | |||
| 32 | #include <asm/io.h> | ||
| 33 | #include <asm/system.h> | ||
| 34 | #include <asm/current.h> | ||
| 35 | #include <asm/prom.h> | ||
| 36 | #include <asm/machdep.h> | ||
| 37 | #include <asm/pmac_feature.h> | 22 | #include <asm/pmac_feature.h> |
| 38 | #include <asm/irq.h> | ||
| 39 | #include <asm/uaccess.h> | ||
| 40 | 23 | ||
| 41 | #include "orinoco.h" | 24 | #include "orinoco.h" |
| 42 | 25 | ||