mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
[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>
This commit is contained in:
parent
37610ff3cb
commit
277cb103e3
1 changed files with 7 additions and 7 deletions
|
@ -175,7 +175,7 @@ static unsigned int cs8900_irq_map[] = {1,0,0,0};
|
|||
#include <asm/irq.h>
|
||||
static unsigned int netcard_portlist[] __initdata = {IXDP2X01_CS8900_VIRT_BASE, 0};
|
||||
static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900, 0, 0, 0};
|
||||
#elif defined(CONFIG_ARCH_PNX0105)
|
||||
#elif defined(CONFIG_ARCH_PNX010X)
|
||||
#include <asm/irq.h>
|
||||
#include <asm/arch/gpio.h>
|
||||
#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)
|
|||
__raw_writel((u16)value, base_addr + (portno << 1));
|
||||
}
|
||||
#else
|
||||
#if defined(CONFIG_ARCH_PNX0501)
|
||||
#if defined(CONFIG_ARCH_PNX010X)
|
||||
static int
|
||||
readword(unsigned long base_addr, int portno)
|
||||
{
|
||||
|
@ -512,7 +512,7 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular)
|
|||
#endif
|
||||
}
|
||||
|
||||
#ifdef CONFIG_ARCH_PNX0105
|
||||
#ifdef CONFIG_ARCH_PNX010X
|
||||
initialize_ebi();
|
||||
|
||||
/* Map GPIO registers for the pins connected to the CS8900a. */
|
||||
|
@ -780,7 +780,7 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular)
|
|||
} else {
|
||||
i = lp->isa_config & INT_NO_MASK;
|
||||
if (lp->chip_type == CS8900) {
|
||||
#if defined(CONFIG_ARCH_IXDP2X01) || defined(CONFIG_ARCH_PNX0105)
|
||||
#if defined(CONFIG_ARCH_IXDP2X01) || defined(CONFIG_ARCH_PNX010X)
|
||||
i = cs8900_irq_map[0];
|
||||
#else
|
||||
/* Translate the IRQ using the IRQ mapping table. */
|
||||
|
@ -1256,7 +1256,7 @@ net_open(struct net_device *dev)
|
|||
int i;
|
||||
int ret;
|
||||
|
||||
#if !defined(CONFIG_SH_HICOSH4) && !defined(CONFIG_ARCH_PNX0105) /* uses irq#1, so this won't work */
|
||||
#if !defined(CONFIG_SH_HICOSH4) && !defined(CONFIG_ARCH_PNX010X) /* uses irq#1, so this won't work */
|
||||
if (dev->irq < 2) {
|
||||
/* Allow interrupts to be generated by the chip */
|
||||
/* Cirrus' release had this: */
|
||||
|
@ -1287,7 +1287,7 @@ net_open(struct net_device *dev)
|
|||
else
|
||||
#endif
|
||||
{
|
||||
#if !defined(CONFIG_ARCH_IXDP2X01) && !defined(CONFIG_ARCH_PNX0105)
|
||||
#if !defined(CONFIG_ARCH_IXDP2X01) && !defined(CONFIG_ARCH_PNX010X)
|
||||
if (((1 << dev->irq) & lp->irq_map) == 0) {
|
||||
printk(KERN_ERR "%s: IRQ %d is not in our map of allowable IRQs, which is %x\n",
|
||||
dev->name, dev->irq, lp->irq_map);
|
||||
|
@ -1372,7 +1372,7 @@ net_open(struct net_device *dev)
|
|||
case A_CNF_MEDIA_10B_2: result = lp->adapter_cnf & A_CNF_10B_2; break;
|
||||
default: result = lp->adapter_cnf & (A_CNF_10B_T | A_CNF_AUI | A_CNF_10B_2);
|
||||
}
|
||||
#ifdef CONFIG_ARCH_PNX0105
|
||||
#ifdef CONFIG_ARCH_PNX010X
|
||||
result = A_CNF_10B_T;
|
||||
#endif
|
||||
if (!result) {
|
||||
|
|
Loading…
Reference in a new issue