Merge commit 'upstream/master'

[linux-2.6] / include / asm-m68knommu / mcfne.h

diff --git a/include/asm-m68knommu/mcfne.h b/include/asm-m68knommu/mcfne.h
index 045875651e4d6b0464446e21e67d4131ef9fd3ec..431f63aadd0ea3fbec75748cdce78c65326ffb89 100644 (file)
--- a/include/asm-m68knommu/mcfne.h
+++ b/include/asm-m68knommu/mcfne.h
@@ -18,7 +18,6 @@
 #define        mcfne_h
 /****************************************************************************/
 
-#include <linux/config.h>
 
 /*
  *     Support for NE2000 clones devices in ColdFire based boards.
@@ -35,7 +34,7 @@
  *     Define the basic hardware resources of NE2000 boards.
  */
 
-#if defined(CONFIG_M5206) && defined(CONFIG_ARNEWSH)
+#if defined(CONFIG_ARN5206)
 #define NE2000_ADDR            0x40000300
 #define NE2000_ODDOFFSET       0x00010000
 #define        NE2000_IRQ_VECTOR       0xf0
@@ -44,7 +43,7 @@
 #define        NE2000_BYTE             volatile unsigned short
 #endif
 
-#if defined(CONFIG_M5206e) && defined(CONFIG_MOTOROLA)
+#if defined(CONFIG_M5206eC3)
 #define        NE2000_ADDR             0x40000300
 #define        NE2000_ODDOFFSET        0x00010000
 #define        NE2000_IRQ_VECTOR       0x1c
@@ -61,18 +60,7 @@
 #define        NE2000_BYTE             volatile unsigned char
 #endif
 
-#if defined(CONFIG_M5206e) && defined(CONFIG_CFV240)
-#define NE2000_ADDR             0x40010000
-#define NE2000_ADDR1            0x40010001
-#define NE2000_ODDOFFSET        0x00000000
-#define NE2000_IRQ              1
-#define NE2000_IRQ_VECTOR       0x19
-#define NE2000_IRQ_PRIORITY     2
-#define NE2000_IRQ_LEVEL        1
-#define        NE2000_BYTE             volatile unsigned char
-#endif
-
-#if defined(CONFIG_M5307) && defined(CONFIG_MOTOROLA)
+#if defined(CONFIG_M5307C3)
 #define NE2000_ADDR            0x40000300
 #define NE2000_ODDOFFSET       0x00010000
 #define NE2000_IRQ_VECTOR      0x1b
@@ -114,7 +102,7 @@
 #define        RSWAP(w)                (((w) << 8) | ((w) >> 8))
 #endif
 
-#if defined(CONFIG_M5307) && defined(CONFIG_ARNEWSH)
+#if defined(CONFIG_ARN5307)
 #define NE2000_ADDR            0xfe600300
 #define NE2000_ODDOFFSET       0x00010000
 #define NE2000_IRQ_VECTOR      0x1b
@@ -123,7 +111,7 @@
 #define        NE2000_BYTE             volatile unsigned short
 #endif
 
-#if defined(CONFIG_M5407)
+#if defined(CONFIG_M5407C3)
 #define NE2000_ADDR            0x40000300
 #define NE2000_ODDOFFSET       0x00010000
 #define NE2000_IRQ_VECTOR      0x1b
@@ -174,13 +162,8 @@ void ne2000_outsw(unsigned int addr, void *vbuf, unsigned long len);
  *     On most NE2000 implementations on ColdFire boards the chip is
  *     mapped in kinda funny, due to its ISA heritage.
  */
-#ifdef CONFIG_CFV240
-#define NE2000_PTR(addr)       (NE2000_ADDR + ((addr & 0x3f) << 1) + 1)
-#define NE2000_DATA_PTR(addr)  (NE2000_ADDR + ((addr & 0x3f) << 1))
-#else
 #define        NE2000_PTR(addr)        ((addr&0x1)?(NE2000_ODDOFFSET+addr-1):(addr))
 #define        NE2000_DATA_PTR(addr)   (addr)
-#endif
 
 
 void ne2000_outb(unsigned int val, unsigned int addr)
@@ -264,7 +247,7 @@ void ne2000_outsw(unsigned int addr, const void *vbuf, unsigned long len)
  *     Minor differences between the different board types.
  */
 
-#if defined(CONFIG_M5206) && defined(CONFIG_ARNEWSH)
+#if defined(CONFIG_ARN5206)
 void ne2000_irqsetup(int irq)
 {
        volatile unsigned char  *icrp;
@@ -275,7 +258,7 @@ void ne2000_irqsetup(int irq)
 }
 #endif
 
-#if defined(CONFIG_M5206e) && defined(CONFIG_MOTOROLA)
+#if defined(CONFIG_M5206eC3)
 void ne2000_irqsetup(int irq)
 {
        volatile unsigned char  *icrp;
@@ -286,17 +269,6 @@ void ne2000_irqsetup(int irq)
 }
 #endif
 
-#if defined(CONFIG_M5206e) && defined(CONFIG_CFV240)
-void ne2000_irqsetup(int irq)
-{
-       volatile unsigned char  *icrp;
-
-       icrp = (volatile unsigned char *) (MCF_MBAR + MCFSIM_ICR1);
-       *icrp = MCFSIM_ICR_LEVEL1 | MCFSIM_ICR_PRI2 | MCFSIM_ICR_AUTOVEC;
-       mcf_setimr(mcf_getimr() & ~MCFSIM_IMR_EINT1);
-}
-#endif
-
 #if defined(CONFIG_M5206e) && defined(CONFIG_NETtel)
 void ne2000_irqsetup(int irq)
 {