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/8390/smc-ultra.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/8390/smc-ultra.c')
| -rw-r--r-- | drivers/net/ethernet/8390/smc-ultra.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/8390/smc-ultra.c b/drivers/net/ethernet/8390/smc-ultra.c index 1cc306a83ff7..b0fbce39661a 100644 --- a/drivers/net/ethernet/8390/smc-ultra.c +++ b/drivers/net/ethernet/8390/smc-ultra.c | |||
| @@ -69,7 +69,6 @@ static const char version[] = | |||
| 69 | 69 | ||
| 70 | #include <asm/io.h> | 70 | #include <asm/io.h> |
| 71 | #include <asm/irq.h> | 71 | #include <asm/irq.h> |
| 72 | #include <asm/system.h> | ||
| 73 | 72 | ||
| 74 | #include "8390.h" | 73 | #include "8390.h" |
| 75 | 74 | ||