Manual merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git

This is a fixed-up version of the broken "upstream-2.6.13" branch, where
I re-did the manual merge of drivers/net/r8169.c by hand, and made sure
the history is all good.

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 = {
 #ifdef CONFIG_AT1700
         {at1700_probe, 0},
 #endif
-#ifdef CONFIG_FMV18X            /* Fujitsu FMV-181/182 */
-        {fmv18x_probe, 0},
-#endif
 #ifdef CONFIG_ETH16I
         {eth16i_probe, 0},      /* ICL EtherTeam 16i/32 */
 #endif
@@ -243,9 +240,6 @@ static struct devprobe2 isa_probes[] __initdata = {
 #ifdef CONFIG_ELPLUS            /* 3c505 */
         {elplus_probe, 0},
 #endif
-#ifdef CONFIG_SK_G16
-        {SK_init, 0},
-#endif
 #ifdef CONFIG_NI5010
         {ni5010_probe, 0},
 #endif