diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-04 08:14:54 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-04 08:14:54 -0800 |
| commit | b02957d58a27525499ab10d272d3b44682a7ae50 (patch) | |
| tree | a220aaf44026a8be815320b3c91f1db43bbf1e2c /drivers/staging/wlan-ng/prism2sta.c | |
| parent | 3a8954e8f22cf31791d8c524c2839433e39f9368 (diff) | |
| parent | b94c765ac31f8eb9c6fe895ba611bb446b799635 (diff) | |
Staging: Merge two branches of coding style fixes together
Turns out that multiple people sent pretty much the same patch
for the same staging drivers. Commit these in two different
branches and merge them together to get a more complete coverage
of the cleanup and properly credit everyone for the work that they
did.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/wlan-ng/prism2sta.c')
| -rw-r--r-- | drivers/staging/wlan-ng/prism2sta.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c index 2da405490c65..31ac8da39c81 100644 --- a/drivers/staging/wlan-ng/prism2sta.c +++ b/drivers/staging/wlan-ng/prism2sta.c @@ -64,7 +64,7 @@ #include <linux/byteorder/generic.h> #include <linux/ctype.h> -#include <asm/io.h> +#include <linux/io.h> #include <linux/delay.h> #include <asm/byteorder.h> #include <linux/if_arp.h> |