fdomain_cs: Sort out modules with duplicate description

[linux-2.6-omap-h63xx.git] / drivers / net / smc911x.h

diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h
index 76c17c28fab4b271006f51163f6029784149c311..bf6240f23f5d77109919057cb213c06167963267 100644 (file)
--- a/drivers/net/smc911x.h
+++ b/drivers/net/smc911x.h
@@ -222,7 +222,7 @@ static inline void SMC_outsl(struct smc911x_local *lp, int reg,
  */
 #include <linux/dma-mapping.h>
 #include <asm/dma.h>
-#include <asm/arch/pxa-regs.h>
+#include <mach/pxa-regs.h>
 
 static dma_addr_t rx_dmabuf, tx_dmabuf;
 static int rx_dmalen, tx_dmalen;
@@ -666,10 +666,13 @@ smc_pxa_dma_outsl(struct smc911x_local *lp, u_long physaddr,
 #define LAN911X_INTERNAL_PHY_ID                (0x0007C000)
 
 /* Chip ID values */
-#define CHIP_9115      0x115
-#define CHIP_9116      0x116
-#define CHIP_9117      0x117
-#define CHIP_9118      0x118
+#define CHIP_9115      0x0115
+#define CHIP_9116      0x0116
+#define CHIP_9117      0x0117
+#define CHIP_9118      0x0118
+#define CHIP_9215      0x115A
+#define CHIP_9217      0x117A
+#define CHIP_9218      0x118A
 
 struct chip_id {
        u16 id;
@@ -681,6 +684,9 @@ static const struct chip_id chip_ids[] =  {
        { CHIP_9116, "LAN9116" },
        { CHIP_9117, "LAN9117" },
        { CHIP_9118, "LAN9118" },
+       { CHIP_9215, "LAN9215" },
+       { CHIP_9217, "LAN9217" },
+       { CHIP_9218, "LAN9218" },
        { 0, NULL },
 };