diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-04-12 13:49:28 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-12 13:49:28 -0400 |
| commit | 8065248069097dddf9945acfb2081025e9618c16 (patch) | |
| tree | eddf3fb0372ba0f65c01382d386942ea8d18932d /drivers/net/ethernet/3com/3c589_cs.c | |
| parent | e66a8ddff72e85605f2212a0ebc666c7e9116641 (diff) | |
| parent | b4838d12e1f3cb48c2489a0b08733b5dbf848297 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/ethernet/3com/3c589_cs.c')
| -rw-r--r-- | drivers/net/ethernet/3com/3c589_cs.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/3com/3c589_cs.c b/drivers/net/ethernet/3com/3c589_cs.c index b23253b9f742..a556c01e011b 100644 --- a/drivers/net/ethernet/3com/3c589_cs.c +++ b/drivers/net/ethernet/3com/3c589_cs.c | |||
| @@ -50,7 +50,6 @@ | |||
| 50 | 50 | ||
| 51 | #include <asm/uaccess.h> | 51 | #include <asm/uaccess.h> |
| 52 | #include <asm/io.h> | 52 | #include <asm/io.h> |
| 53 | #include <asm/system.h> | ||
| 54 | 53 | ||
| 55 | /* To minimize the size of the driver source I only define operating | 54 | /* To minimize the size of the driver source I only define operating |
| 56 | constants if they are used several times. You'll need the manual | 55 | constants if they are used several times. You'll need the manual |