diff options
| author | NeilBrown <neilb@suse.de> | 2010-08-10 02:02:33 +0200 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2010-08-10 02:02:33 +0200 |
| commit | fd8aa2c1811bf60ccb2d5de0579c6f62aec1772d (patch) | |
| tree | 311567d03758afc3a93b4273fe172836e89bb01d /drivers/net/Space.c | |
| parent | md: clean up do_md_stop (diff) | |
| parent | Merge branch 'async' of macbook:git/btrfs-unstable (diff) | |
| download | linux-fd8aa2c1811bf60ccb2d5de0579c6f62aec1772d.tar.xz linux-fd8aa2c1811bf60ccb2d5de0579c6f62aec1772d.zip | |
Merge git://git.infradead.org/users/dwmw2/libraid-2.6 into for-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 3b79c6cf21a3..9bb405bd664e 100644 --- a/drivers/net/Space.c +++ b/drivers/net/Space.c @@ -218,12 +218,6 @@ static struct devprobe2 isa_probes[] __initdata = { #ifdef CONFIG_EL1 /* 3c501 */ {el1_probe, 0}, #endif -#ifdef CONFIG_WAVELAN /* WaveLAN */ - {wavelan_probe, 0}, -#endif -#ifdef CONFIG_ARLAN /* Aironet */ - {arlan_probe, 0}, -#endif #ifdef CONFIG_EL16 /* 3c507 */ {el16_probe, 0}, #endif |