diff options
Diffstat (limited to 'drivers/net/pcmcia/ibmtr_cs.c')
-rw-r--r-- | drivers/net/pcmcia/ibmtr_cs.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c index 76706e12d731..37f4a6fdc3ef 100644 --- a/drivers/net/pcmcia/ibmtr_cs.c +++ b/drivers/net/pcmcia/ibmtr_cs.c | |||
@@ -119,6 +119,12 @@ static const struct ethtool_ops netdev_ethtool_ops = { | |||
119 | .get_drvinfo = netdev_get_drvinfo, | 119 | .get_drvinfo = netdev_get_drvinfo, |
120 | }; | 120 | }; |
121 | 121 | ||
122 | static irqreturn_t ibmtr_interrupt(int irq, void *dev_id) { | ||
123 | ibmtr_dev_t *info = dev_id; | ||
124 | struct net_device *dev = info->dev; | ||
125 | return tok_interrupt(irq, dev); | ||
126 | }; | ||
127 | |||
122 | /*====================================================================== | 128 | /*====================================================================== |
123 | 129 | ||
124 | ibmtr_attach() creates an "instance" of the driver, allocating | 130 | ibmtr_attach() creates an "instance" of the driver, allocating |
@@ -150,14 +156,13 @@ static int __devinit ibmtr_attach(struct pcmcia_device *link) | |||
150 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; | 156 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; |
151 | link->io.NumPorts1 = 4; | 157 | link->io.NumPorts1 = 4; |
152 | link->io.IOAddrLines = 16; | 158 | link->io.IOAddrLines = 16; |
153 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT; | 159 | link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; |
154 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | 160 | link->irq.Handler = ibmtr_interrupt; |
155 | link->irq.Handler = &tok_interrupt; | ||
156 | link->conf.Attributes = CONF_ENABLE_IRQ; | 161 | link->conf.Attributes = CONF_ENABLE_IRQ; |
157 | link->conf.IntType = INT_MEMORY_AND_IO; | 162 | link->conf.IntType = INT_MEMORY_AND_IO; |
158 | link->conf.Present = PRESENT_OPTION; | 163 | link->conf.Present = PRESENT_OPTION; |
159 | 164 | ||
160 | link->irq.Instance = info->dev = dev; | 165 | info->dev = dev; |
161 | 166 | ||
162 | SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops); | 167 | SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops); |
163 | 168 | ||