diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-20 12:35:34 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-20 12:35:34 -0400 |
| commit | 8ba08378b479f472b37b83542c31bdad465033cf (patch) | |
| tree | f4421227b3065e786c9041cf0ce0073a249e011b /drivers/net/Space.c | |
| parent | 34b727c135ff651f153be5757056d25678b6d018 (diff) | |
| parent | 8b22c249e7de453961e4d253b19fc2a0bdd65d53 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/net/Space.c')
| -rw-r--r-- | drivers/net/Space.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/Space.c b/drivers/net/Space.c index fb433325aa27..3707df6b0cfa 100644 --- a/drivers/net/Space.c +++ b/drivers/net/Space.c | |||
| @@ -210,9 +210,6 @@ static struct devprobe2 isa_probes[] __initdata = { | |||
| 210 | #ifdef CONFIG_AT1700 | 210 | #ifdef CONFIG_AT1700 |
| 211 | {at1700_probe, 0}, | 211 | {at1700_probe, 0}, |
| 212 | #endif | 212 | #endif |
| 213 | #ifdef CONFIG_FMV18X /* Fujitsu FMV-181/182 */ | ||
| 214 | {fmv18x_probe, 0}, | ||
| 215 | #endif | ||
| 216 | #ifdef CONFIG_ETH16I | 213 | #ifdef CONFIG_ETH16I |
| 217 | {eth16i_probe, 0}, /* ICL EtherTeam 16i/32 */ | 214 | {eth16i_probe, 0}, /* ICL EtherTeam 16i/32 */ |
| 218 | #endif | 215 | #endif |
| @@ -243,9 +240,6 @@ static struct devprobe2 isa_probes[] __initdata = { | |||
| 243 | #ifdef CONFIG_ELPLUS /* 3c505 */ | 240 | #ifdef CONFIG_ELPLUS /* 3c505 */ |
| 244 | {elplus_probe, 0}, | 241 | {elplus_probe, 0}, |
| 245 | #endif | 242 | #endif |
| 246 | #ifdef CONFIG_SK_G16 | ||
| 247 | {SK_init, 0}, | ||
| 248 | #endif | ||
| 249 | #ifdef CONFIG_NI5010 | 243 | #ifdef CONFIG_NI5010 |
| 250 | {ni5010_probe, 0}, | 244 | {ni5010_probe, 0}, |
| 251 | #endif | 245 | #endif |