diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-29 18:21:41 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-29 18:21:41 -0400 |
| commit | d18bfacff20f08aecf01bb971b110ca108eef3c7 (patch) | |
| tree | 255f862839c593c796e609328575b611e3f56cf3 /drivers/net/at1700.c | |
| parent | a68db763af9b676590c3fe9ec3f17bf18015eb2f (diff) | |
| parent | fd782a4a99d2d3e818b9465c427b10f7f027d7da (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/net/at1700.c')
| -rw-r--r-- | drivers/net/at1700.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c index b8ab2b6355eb..e613cc289749 100644 --- a/drivers/net/at1700.c +++ b/drivers/net/at1700.c | |||
| @@ -34,10 +34,6 @@ | |||
| 34 | only is it difficult to detect, it also moves around in I/O space in | 34 | only is it difficult to detect, it also moves around in I/O space in |
| 35 | response to inb()s from other device probes! | 35 | response to inb()s from other device probes! |
| 36 | */ | 36 | */ |
| 37 | /* | ||
| 38 | 99/03/03 Allied Telesis RE1000 Plus support by T.Hagawa | ||
| 39 | 99/12/30 port to 2.3.35 by K.Takai | ||
| 40 | */ | ||
| 41 | 37 | ||
| 42 | #include <linux/config.h> | 38 | #include <linux/config.h> |
| 43 | #include <linux/errno.h> | 39 | #include <linux/errno.h> |