From 7593aab62cf61b457e08de103cd853a455748813 Mon Sep 17 00:00:00 2001 From: Jaccon Bastiaansen Date: Thu, 26 Jan 2012 21:47:11 +0100 Subject: [PATCH] --- yaml --- r: 296041 b: refs/heads/master c: 69c311fd604a01db3ab26c3f16d6c9cb0b2d5de6 h: refs/heads/master i: 296039: 07eb914cc4a86873d4cca5d27b6504c8be68035f v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/cirrus/cs89x0.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 2ffd9cefdb33..b223f8ae9e1f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c8c9e8379723e769c84e2b1914c56cfbb2c0988d +refs/heads/master: 69c311fd604a01db3ab26c3f16d6c9cb0b2d5de6 diff --git a/trunk/drivers/net/ethernet/cirrus/cs89x0.c b/trunk/drivers/net/ethernet/cirrus/cs89x0.c index 6b3cd24eb454..f7449bdd2cc3 100644 --- a/trunk/drivers/net/ethernet/cirrus/cs89x0.c +++ b/trunk/drivers/net/ethernet/cirrus/cs89x0.c @@ -182,11 +182,6 @@ static unsigned int cs8900_irq_map[] = {IRQ_IXDP2351_CS8900, 0, 0, 0}; #define CS89x0_NONISA_IRQ static unsigned int netcard_portlist[] __used __initdata = {IXDP2X01_CS8900_VIRT_BASE, 0}; static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900, 0, 0, 0}; -#elif defined(CONFIG_MACH_QQ2440) -#define CS89x0_NONISA_IRQ -#include -static unsigned int netcard_portlist[] __used __initdata = { QQ2440_CS8900_VIRT_BASE + 0x300, 0 }; -static unsigned int cs8900_irq_map[] = { QQ2440_CS8900_IRQ, 0, 0, 0 }; #elif defined(CONFIG_MACH_MX31ADS) #define CS89x0_NONISA_IRQ #include @@ -543,9 +538,6 @@ cs89x0_probe1(struct net_device *dev, unsigned long ioaddr, int modular) lp->force = g_cs89x0_media__force; #endif -#if defined(CONFIG_MACH_QQ2440) - lp->force |= FORCE_RJ45 | FORCE_FULL; -#endif } /* Grab the region so we can find another board if autoIRQ fails. */