Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 277cb103 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Linus Torvalds
Browse files

[PATCH] cs89x0: fix up after pnx0105 Kconfig symbol renaming 



The Kconfig symbol for pnx0105 was recently renamed to ARCH_PNX010X.

Signed-off-by: default avatarLennert Buytenhek <buytenh@wantstofly.org>
Cc: dmitry pervushin <dpervushin@ru.mvista.com>
Cc: <dsaxena@plexity.net>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 37610ff3

drivers/net/cs89x0.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -175,7 +175,7 @@ static unsigned int cs8900_irq_map[] = {1,0,0,0}; 
#include <asm/irq.h>

#include <asm/irq.h>

static unsigned int netcard_portlist[] __initdata = {IXDP2X01_CS8900_VIRT_BASE, 0};

static unsigned int netcard_portlist[] __initdata = {IXDP2X01_CS8900_VIRT_BASE, 0};

static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900, 0, 0, 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/irq.h>

#include <asm/arch/gpio.h>

#include <asm/arch/gpio.h>

#define CIRRUS_DEFAULT_BASE	IO_ADDRESS(EXT_STATIC2_s0_BASE + 0x200000)	/* = Physical address 0x48200000 */

#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));

	__raw_writel((u16)value, base_addr + (portno << 1));

}

}

#else

#else

#if defined(CONFIG_ARCH_PNX0501)

#if defined(CONFIG_ARCH_PNX010X)

static int

static int

readword(unsigned long base_addr, int portno)

readword(unsigned long base_addr, int portno)

{

{
@@ -512,7 +512,7 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular) 
#endif

#endif

        }

        }





#ifdef CONFIG_ARCH_PNX0105

#ifdef CONFIG_ARCH_PNX010X

	initialize_ebi();

	initialize_ebi();





	/* Map GPIO registers for the pins connected to the CS8900a. */

	/* 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 {

	} else {

		i = lp->isa_config & INT_NO_MASK;

		i = lp->isa_config & INT_NO_MASK;

		if (lp->chip_type == CS8900) {

		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];

		        i = cs8900_irq_map[0];

#else

#else

			/* Translate the IRQ using the IRQ mapping table. */

			/* Translate the IRQ using the IRQ mapping table. */
@@ -1256,7 +1256,7 @@ net_open(struct net_device *dev) 
	int i;

	int i;

	int ret;

	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) {

	if (dev->irq < 2) {

		/* Allow interrupts to be generated by the chip */

		/* Allow interrupts to be generated by the chip */

/* Cirrus' release had this: */

/* Cirrus' release had this: */
@@ -1287,7 +1287,7 @@ net_open(struct net_device *dev) 
	else

	else

#endif

#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) {

		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",

			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);

                               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;

	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);

        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;

	result = A_CNF_10B_T;

#endif

#endif

        if (!result) {

        if (!result) {