Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block:
  splice: direct splicing updates ppos twice
  more ACSI removal
  umem: Fix match of pci_ids in umem driver
  umem: Remove references to dead CONFIG_MM_MAP_MEMORY variable
  remove the documentation for the legacy CDROM drivers

1 files changed, 0 insertions, 8 deletions

diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index 1c3e293fbaf7..3b79c6cf21a3 100644
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -75,8 +75,6 @@ extern struct net_device *atarilance_probe(int unit);
 extern struct net_device *sun3lance_probe(int unit);
 extern struct net_device *sun3_82586_probe(int unit);
 extern struct net_device *apne_probe(int unit);
-extern struct net_device *bionet_probe(int unit);
-extern struct net_device *pamsnet_probe(int unit);
 extern struct net_device *cs89x0_probe(int unit);
 extern struct net_device *hplance_probe(int unit);
 extern struct net_device *bagetlance_probe(int unit);
@@ -264,12 +262,6 @@ static struct devprobe2 m68k_probes[] __initdata = {
 #ifdef CONFIG_APNE              /* A1200 PCMCIA NE2000 */
         {apne_probe, 0},
 #endif
-#ifdef CONFIG_ATARI_BIONET      /* Atari Bionet Ethernet board */
-        {bionet_probe, 0},
-#endif
-#ifdef CONFIG_ATARI_PAMSNET     /* Atari PAMsNet Ethernet board */
-        {pamsnet_probe, 0},
-#endif
 #ifdef CONFIG_MVME147_NET       /* MVME147 internal Ethernet */
         {mvme147lance_probe, 0},
 #endif