diff options
author | Lennert Buytenhek <buytenh@wantstofly.org> | 2006-01-08 04:01:14 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-08 23:12:46 -0500 |
commit | 277cb103e3d7b31b8f4941b6a495b1b80236b05c (patch) | |
tree | 3a0f4bb2e2342fb41425301fbcb4b711a9d179e4 | |
parent | 37610ff3cb63f59b89370681ff780687d8a7bed3 (diff) |
[PATCH] cs89x0: fix up after pnx0105 Kconfig symbol renaming
The Kconfig symbol for pnx0105 was recently renamed to ARCH_PNX010X.
Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Cc: dmitry pervushin <dpervushin@ru.mvista.com>
Cc: <dsaxena@plexity.net>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/net/cs89x0.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c index f7ec590e80ea..907c01009746 100644 --- a/drivers/net/cs89x0.c +++ b/drivers/net/cs89x0.c | |||
@@ -175,7 +175,7 @@ static unsigned int cs8900_irq_map[] = {1,0,0,0}; | |||
175 | #include <asm/irq.h> | 175 | #include <asm/irq.h> |
176 | static unsigned int netcard_portlist[] __initdata = {IXDP2X01_CS8900_VIRT_BASE, 0}; | 176 | static unsigned int netcard_portlist[] __initdata = {IXDP2X01_CS8900_VIRT_BASE, 0}; |
177 | static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900, 0, 0, 0}; | 177 | static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900, 0, 0, 0}; |
178 | #elif defined(CONFIG_ARCH_PNX0105) | 178 | #elif defined(CONFIG_ARCH_PNX010X) |
179 | #include <asm/irq.h> | 179 | #include <asm/irq.h> |
180 | #include <asm/arch/gpio.h> | 180 | #include <asm/arch/gpio.h> |
181 | #define CIRRUS_DEFAULT_BASE IO_ADDRESS(EXT_STATIC2_s0_BASE + 0x200000) /* = Physical address 0x48200000 */ | 181 | #define CIRRUS_DEFAULT_BASE IO_ADDRESS(EXT_STATIC2_s0_BASE + 0x200000) /* = Physical address 0x48200000 */ |
@@ -351,7 +351,7 @@ writeword(unsigned long base_addr, int portno, int value) | |||
351 | __raw_writel((u16)value, base_addr + (portno << 1)); | 351 | __raw_writel((u16)value, base_addr + (portno << 1)); |
352 | } | 352 | } |
353 | #else | 353 | #else |
354 | #if defined(CONFIG_ARCH_PNX0501) | 354 | #if defined(CONFIG_ARCH_PNX010X) |
355 | static int | 355 | static int |
356 | readword(unsigned long base_addr, int portno) | 356 | readword(unsigned long base_addr, int portno) |
357 | { | 357 | { |
@@ -512,7 +512,7 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular) | |||
512 | #endif | 512 | #endif |
513 | } | 513 | } |
514 | 514 | ||
515 | #ifdef CONFIG_ARCH_PNX0105 | 515 | #ifdef CONFIG_ARCH_PNX010X |
516 | initialize_ebi(); | 516 | initialize_ebi(); |
517 | 517 | ||
518 | /* Map GPIO registers for the pins connected to the CS8900a. */ | 518 | /* Map GPIO registers for the pins connected to the CS8900a. */ |
@@ -780,7 +780,7 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular) | |||
780 | } else { | 780 | } else { |
781 | i = lp->isa_config & INT_NO_MASK; | 781 | i = lp->isa_config & INT_NO_MASK; |
782 | if (lp->chip_type == CS8900) { | 782 | if (lp->chip_type == CS8900) { |
783 | #if defined(CONFIG_ARCH_IXDP2X01) || defined(CONFIG_ARCH_PNX0105) | 783 | #if defined(CONFIG_ARCH_IXDP2X01) || defined(CONFIG_ARCH_PNX010X) |
784 | i = cs8900_irq_map[0]; | 784 | i = cs8900_irq_map[0]; |
785 | #else | 785 | #else |
786 | /* Translate the IRQ using the IRQ mapping table. */ | 786 | /* Translate the IRQ using the IRQ mapping table. */ |
@@ -1256,7 +1256,7 @@ net_open(struct net_device *dev) | |||
1256 | int i; | 1256 | int i; |
1257 | int ret; | 1257 | int ret; |
1258 | 1258 | ||
1259 | #if !defined(CONFIG_SH_HICOSH4) && !defined(CONFIG_ARCH_PNX0105) /* uses irq#1, so this won't work */ | 1259 | #if !defined(CONFIG_SH_HICOSH4) && !defined(CONFIG_ARCH_PNX010X) /* uses irq#1, so this won't work */ |
1260 | if (dev->irq < 2) { | 1260 | if (dev->irq < 2) { |
1261 | /* Allow interrupts to be generated by the chip */ | 1261 | /* Allow interrupts to be generated by the chip */ |
1262 | /* Cirrus' release had this: */ | 1262 | /* Cirrus' release had this: */ |
@@ -1287,7 +1287,7 @@ net_open(struct net_device *dev) | |||
1287 | else | 1287 | else |
1288 | #endif | 1288 | #endif |
1289 | { | 1289 | { |
1290 | #if !defined(CONFIG_ARCH_IXDP2X01) && !defined(CONFIG_ARCH_PNX0105) | 1290 | #if !defined(CONFIG_ARCH_IXDP2X01) && !defined(CONFIG_ARCH_PNX010X) |
1291 | if (((1 << dev->irq) & lp->irq_map) == 0) { | 1291 | if (((1 << dev->irq) & lp->irq_map) == 0) { |
1292 | printk(KERN_ERR "%s: IRQ %d is not in our map of allowable IRQs, which is %x\n", | 1292 | printk(KERN_ERR "%s: IRQ %d is not in our map of allowable IRQs, which is %x\n", |
1293 | dev->name, dev->irq, lp->irq_map); | 1293 | dev->name, dev->irq, lp->irq_map); |
@@ -1372,7 +1372,7 @@ net_open(struct net_device *dev) | |||
1372 | case A_CNF_MEDIA_10B_2: result = lp->adapter_cnf & A_CNF_10B_2; break; | 1372 | case A_CNF_MEDIA_10B_2: result = lp->adapter_cnf & A_CNF_10B_2; break; |
1373 | default: result = lp->adapter_cnf & (A_CNF_10B_T | A_CNF_AUI | A_CNF_10B_2); | 1373 | default: result = lp->adapter_cnf & (A_CNF_10B_T | A_CNF_AUI | A_CNF_10B_2); |
1374 | } | 1374 | } |
1375 | #ifdef CONFIG_ARCH_PNX0105 | 1375 | #ifdef CONFIG_ARCH_PNX010X |
1376 | result = A_CNF_10B_T; | 1376 | result = A_CNF_10B_T; |
1377 | #endif | 1377 | #endif |
1378 | if (!result) { | 1378 | if (!result) { |