CS89x0: Finish transition to CS89x0_NONISA_IRQ

CS89x0_NONISA_IRQ is selected by all those non-ISA boards which use
CS89x0. This patch only cleans the last bits left after its introduction.

Signed-off-by: Domenico Andreoli <cavokz@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index d325e01a53e0..e6ac755ff5ce 100644
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -943,10 +943,10 @@ skip_this_frame:
 static void __init reset_chip(struct net_device *dev)
 {
 #if !defined(CONFIG_MACH_MX31ADS)
-#if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01)
+#if !defined(CS89x0_NONISA_IRQ)
         struct net_local *lp = netdev_priv(dev);
         int ioaddr = dev->base_addr;
-#endif
+#endif /* CS89x0_NONISA_IRQ */
         int reset_start_time;
 
         writereg(dev, PP_SelfCTL, readreg(dev, PP_SelfCTL) | POWER_ON_RESET);
@@ -954,7 +954,7 @@ static void __init reset_chip(struct net_device *dev)
         /* wait 30 ms */
         msleep(30);
 
-#if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01)
+#if !defined(CS89x0_NONISA_IRQ)
         if (lp->chip_type != CS8900) {
                 /* Hardware problem requires PNP registers to be reconfigured after a reset */
                 writeword(ioaddr, ADD_PORT, PP_CS8920_ISAINT);
@@ -965,7 +965,7 @@ static void __init reset_chip(struct net_device *dev)
                 outb((dev->mem_start >> 16) & 0xff, ioaddr + DATA_PORT);
                 outb((dev->mem_start >> 8) & 0xff,   ioaddr + DATA_PORT + 1);
         }
-#endif  /* IXDP2x01 */
+#endif /* CS89x0_NONISA_IRQ */
 
         /* Wait until the chip is reset */
         reset_start_time = jiffies;