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, 16 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 7903f9c7839e..713ab05a87c0 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -405,22 +405,6 @@ config ATARILANCE
           on the AMD Lance chipset: RieblCard (with or without battery), or
           PAMCard VME (also the version by Rhotron, with different addresses).
 
-config ATARI_BIONET
-        tristate "BioNet-100 support"
-        depends on ATARI && ATARI_ACSI && BROKEN
-        help
-          Say Y to include support for BioData's BioNet-100 Ethernet adapter
-          for the ACSI port. The driver works (has to work...) with a polled
-          I/O scheme, so it's rather slow :-(
-
-config ATARI_PAMSNET
-        tristate "PAMsNet support"
-        depends on ATARI && ATARI_ACSI && BROKEN
-        help
-          Say Y to include support for the PAMsNet Ethernet adapter for the
-          ACSI port ("ACSI node"). The driver works (has to work...) with a
-          polled I/O scheme, so it's rather slow :-(
-
 config SUN3LANCE
         tristate "Sun3/Sun3x on-board LANCE support"
         depends on SUN3 || SUN3X