diff options
-rw-r--r-- | drivers/net/cs89x0.c | 8 |
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: | |||
943 | static void __init reset_chip(struct net_device *dev) | 943 | static void __init reset_chip(struct net_device *dev) |
944 | { | 944 | { |
945 | #if !defined(CONFIG_MACH_MX31ADS) | 945 | #if !defined(CONFIG_MACH_MX31ADS) |
946 | #if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01) | 946 | #if !defined(CS89x0_NONISA_IRQ) |
947 | struct net_local *lp = netdev_priv(dev); | 947 | struct net_local *lp = netdev_priv(dev); |
948 | int ioaddr = dev->base_addr; | 948 | int ioaddr = dev->base_addr; |
949 | #endif | 949 | #endif /* CS89x0_NONISA_IRQ */ |
950 | int reset_start_time; | 950 | int reset_start_time; |
951 | 951 | ||
952 | writereg(dev, PP_SelfCTL, readreg(dev, PP_SelfCTL) | POWER_ON_RESET); | 952 | writereg(dev, PP_SelfCTL, readreg(dev, PP_SelfCTL) | POWER_ON_RESET); |
@@ -954,7 +954,7 @@ static void __init reset_chip(struct net_device *dev) | |||
954 | /* wait 30 ms */ | 954 | /* wait 30 ms */ |
955 | msleep(30); | 955 | msleep(30); |
956 | 956 | ||
957 | #if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01) | 957 | #if !defined(CS89x0_NONISA_IRQ) |
958 | if (lp->chip_type != CS8900) { | 958 | if (lp->chip_type != CS8900) { |
959 | /* Hardware problem requires PNP registers to be reconfigured after a reset */ | 959 | /* Hardware problem requires PNP registers to be reconfigured after a reset */ |
960 | writeword(ioaddr, ADD_PORT, PP_CS8920_ISAINT); | 960 | writeword(ioaddr, ADD_PORT, PP_CS8920_ISAINT); |
@@ -965,7 +965,7 @@ static void __init reset_chip(struct net_device *dev) | |||
965 | outb((dev->mem_start >> 16) & 0xff, ioaddr + DATA_PORT); | 965 | outb((dev->mem_start >> 16) & 0xff, ioaddr + DATA_PORT); |
966 | outb((dev->mem_start >> 8) & 0xff, ioaddr + DATA_PORT + 1); | 966 | outb((dev->mem_start >> 8) & 0xff, ioaddr + DATA_PORT + 1); |
967 | } | 967 | } |
968 | #endif /* IXDP2x01 */ | 968 | #endif /* CS89x0_NONISA_IRQ */ |
969 | 969 | ||
970 | /* Wait until the chip is reset */ | 970 | /* Wait until the chip is reset */ |
971 | reset_start_time = jiffies; | 971 | reset_start_time = jiffies; |