2 files changed, 0 insertions, 71 deletions

diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c
index 0d66700c6ced..bfc8c3eae9a1 100644
--- a/drivers/net/tokenring/lanstreamer.c
+++ b/drivers/net/tokenring/lanstreamer.c
@@ -1876,7 +1876,6 @@ static int sprintf_info(char *buffer, struct net_device *dev)
                 datap[size+1]=io_word & 0xff;
         }
 
-
         size = sprintf(buffer, "\n%6s: Adapter Address   : Node Address      : Functional Addr\n", dev->name);
 
         size += sprintf(buffer + size,
@@ -1932,64 +1931,6 @@ static int sprintf_info(char *buffer, struct net_device *dev)
 #endif
 #endif
 
-#if STREAMER_IOCTL && (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-static int streamer_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
-{
-        int i;
-        struct streamer_private *streamer_priv = (struct streamer_private *) dev->priv;
-        u8 __iomem *streamer_mmio = streamer_priv->streamer_mmio;
-
-        switch(cmd) {
-        case IOCTL_SISR_MASK:
-                writew(SISR_MI, streamer_mmio + SISR_MASK_SUM);
-                break;
-        case IOCTL_SPIN_LOCK_TEST:
-                printk(KERN_INFO "spin_lock() called.\n");
-                spin_lock(&streamer_priv->streamer_lock);
-                spin_unlock(&streamer_priv->streamer_lock);
-                printk(KERN_INFO "spin_unlock() finished.\n");
-                break;
-        case IOCTL_PRINT_BDAS:
-                printk(KERN_INFO "bdas: RXBDA: %x RXLBDA: %x TX2FDA: %x TX2LFDA: %x\n",
-                       readw(streamer_mmio + RXBDA),
-                       readw(streamer_mmio + RXLBDA),
-                       readw(streamer_mmio + TX2FDA),
-                       readw(streamer_mmio + TX2LFDA));
-                break;
-        case IOCTL_PRINT_REGISTERS:
-                printk(KERN_INFO "registers:\n");
-                printk(KERN_INFO "SISR: %04x MISR: %04x LISR: %04x BCTL: %04x BMCTL: %04x\nmask  %04x mask  %04x\n", 
-                       readw(streamer_mmio + SISR),
-                       readw(streamer_mmio + MISR_RUM),
-                       readw(streamer_mmio + LISR),
-                       readw(streamer_mmio + BCTL),
-                       readw(streamer_mmio + BMCTL_SUM),
-                       readw(streamer_mmio + SISR_MASK),
-                       readw(streamer_mmio + MISR_MASK));
-                break;
-        case IOCTL_PRINT_RX_BUFS:
-                printk(KERN_INFO "Print rx bufs:\n");
-                for(i=0; i<STREAMER_RX_RING_SIZE; i++)
-                        printk(KERN_INFO "rx_ring %d status: 0x%x\n", i, 
-                               streamer_priv->streamer_rx_ring[i].status);
-                break;
-        case IOCTL_PRINT_TX_BUFS:
-                printk(KERN_INFO "Print tx bufs:\n");
-                for(i=0; i<STREAMER_TX_RING_SIZE; i++)
-                        printk(KERN_INFO "tx_ring %d status: 0x%x\n", i, 
-                               streamer_priv->streamer_tx_ring[i].status);
-                break;
-        case IOCTL_RX_CMD:
-                streamer_rx(dev);
-                printk(KERN_INFO "Sent rx command.\n");
-                break;
-        default:
-                printk(KERN_INFO "Bad ioctl!\n");
-        }
-        return 0;
-}
-#endif
-
 static struct pci_driver streamer_pci_driver = {
   .name     = "lanstreamer",
   .id_table = streamer_pci_tbl,
diff --git a/drivers/net/tokenring/lanstreamer.h b/drivers/net/tokenring/lanstreamer.h
index 5557d8e1e22d..e7bb3494afc7 100644
--- a/drivers/net/tokenring/lanstreamer.h
+++ b/drivers/net/tokenring/lanstreamer.h
@@ -62,18 +62,6 @@
 
 #include <linux/version.h>
 
-#if STREAMER_IOCTL && (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-#include <asm/ioctl.h>
-#define IOCTL_PRINT_RX_BUFS   SIOCDEVPRIVATE
-#define IOCTL_PRINT_TX_BUFS   SIOCDEVPRIVATE+1
-#define IOCTL_RX_CMD          SIOCDEVPRIVATE+2
-#define IOCTL_TX_CMD          SIOCDEVPRIVATE+3
-#define IOCTL_PRINT_REGISTERS SIOCDEVPRIVATE+4
-#define IOCTL_PRINT_BDAS      SIOCDEVPRIVATE+5
-#define IOCTL_SPIN_LOCK_TEST  SIOCDEVPRIVATE+6
-#define IOCTL_SISR_MASK       SIOCDEVPRIVATE+7
-#endif
-
 /* MAX_INTR - the maximum number of times we can loop
  * inside the interrupt function before returning
  * control to the OS (maximum value is 256)