[netdrvr mv643xx] rename from mv64340 to mv643xx

And move MIPS-specific header to include/linux.

9 files changed, 32 insertions, 32 deletions

diff --git a/arch/mips/configs/jaguar-atx_defconfig b/arch/mips/configs/jaguar-atx_defconfig
index f28e0657e6a7..d5e3498b34e6 100644
--- a/arch/mips/configs/jaguar-atx_defconfig
+++ b/arch/mips/configs/jaguar-atx_defconfig
@@ -298,10 +298,10 @@ CONFIG_EEPRO100=y
 # CONFIG_R8169 is not set
 # CONFIG_SK98LIN is not set
 # CONFIG_TIGON3 is not set
-CONFIG_MV64340_ETH=y
-CONFIG_MV64340_ETH_0=y
-CONFIG_MV64340_ETH_1=y
-CONFIG_MV64340_ETH_2=y
+CONFIG_MV643XX_ETH=y
+CONFIG_MV643XX_ETH_0=y
+CONFIG_MV643XX_ETH_1=y
+CONFIG_MV643XX_ETH_2=y
 
 #
 # Ethernet (10000 Mbit)
diff --git a/arch/mips/configs/ocelot_c_defconfig b/arch/mips/configs/ocelot_c_defconfig
index 704bd7e7845d..f29274341cf4 100644
--- a/arch/mips/configs/ocelot_c_defconfig
+++ b/arch/mips/configs/ocelot_c_defconfig
@@ -300,7 +300,7 @@ CONFIG_NET_ETHERNET=y
 # CONFIG_R8169 is not set
 # CONFIG_SK98LIN is not set
 # CONFIG_TIGON3 is not set
-# CONFIG_MV64340_ETH is not set
+# CONFIG_MV643XX_ETH is not set
 
 #
 # Ethernet (10000 Mbit)
diff --git a/arch/mips/momentum/jaguar_atx/prom.c b/arch/mips/momentum/jaguar_atx/prom.c
index 0ec82a10df5c..bae413f75806 100644
--- a/arch/mips/momentum/jaguar_atx/prom.c
+++ b/arch/mips/momentum/jaguar_atx/prom.c
@@ -41,7 +41,7 @@ const char *get_system_type(void)
 	return "Momentum Jaguar-ATX";
 }
 
-#ifdef CONFIG_MV64340_ETH
+#ifdef CONFIG_MV643XX_ETH
 extern unsigned char prom_mac_addr_base[6];
 
 static void burn_clocks(void)
@@ -231,7 +231,7 @@ void __init prom_init(void)
 	mips_machgroup = MACH_GROUP_MOMENCO;
 	mips_machtype = MACH_MOMENCO_JAGUAR_ATX;
 
-#ifdef CONFIG_MV64340_ETH
+#ifdef CONFIG_MV643XX_ETH
 	/* get the base MAC address for on-board ethernet ports */
 	get_mac(prom_mac_addr_base);
 #endif
diff --git a/arch/mips/momentum/ocelot_c/prom.c b/arch/mips/momentum/ocelot_c/prom.c
index a01bedb4485c..eb1a0701c3bd 100644
--- a/arch/mips/momentum/ocelot_c/prom.c
+++ b/arch/mips/momentum/ocelot_c/prom.c
@@ -32,7 +32,7 @@ struct callvectors* debug_vectors;
 extern unsigned long mv64340_base;
 extern unsigned long cpu_clock;
 
-#ifdef CONFIG_MV64340_ETH
+#ifdef CONFIG_MV643XX_ETH
 extern unsigned char prom_mac_addr_base[6];
 #endif
 
@@ -45,7 +45,7 @@ const char *get_system_type(void)
 #endif
 }
 
-#ifdef CONFIG_MV64340_ETH
+#ifdef CONFIG_MV643XX_ETH
 static void burn_clocks(void)
 {
 	int i;
@@ -227,7 +227,7 @@ void __init prom_init(void)
 	mips_machgroup = MACH_GROUP_MOMENCO;
 	mips_machtype = MACH_MOMENCO_OCELOT_C;
 
-#ifdef CONFIG_MV64340_ETH
+#ifdef CONFIG_MV643XX_ETH
 	/* get the base MAC address for on-board ethernet ports */
 	get_mac(prom_mac_addr_base);
 #endif
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index aacc263c64b9..901b988f78f3 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2131,32 +2131,32 @@ config TIGON3
 	  To compile this driver as a module, choose M here: the module
 	  will be called tg3.  This is recommended.
 
-config MV64340_ETH
-	tristate "MV-64340 Ethernet support"
+config MV643XX_ETH
+	tristate "MV-643XX Ethernet support"
 	depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX
 	help
-	  This driver supports the gigabit Ethernet on the Marvell MV64340
+	  This driver supports the gigabit Ethernet on the Marvell MV643XX
 	  chipset which is used in the Momenco Ocelot C and Jaguar ATX.
 
-config MV64340_ETH_0
-	bool "MV-64340 Port 0"
-	depends on MV64340_ETH
+config MV643XX_ETH_0
+	bool "MV-643XX Port 0"
+	depends on MV643XX_ETH
 	help
-	  This enables support for Port 0 of the Marvell MV64340 Gigabit
+	  This enables support for Port 0 of the Marvell MV643XX Gigabit
 	  Ethernet.
 
-config MV64340_ETH_1
-	bool "MV-64340 Port 1"
-	depends on MV64340_ETH
+config MV643XX_ETH_1
+	bool "MV-643XX Port 1"
+	depends on MV643XX_ETH
 	help
-	  This enables support for Port 1 of the Marvell MV64340 Gigabit
+	  This enables support for Port 1 of the Marvell MV643XX Gigabit
 	  Ethernet.
 
-config MV64340_ETH_2
-	bool "MV-64340 Port 2"
-	depends on MV64340_ETH
+config MV643XX_ETH_2
+	bool "MV-643XX Port 2"
+	depends on MV643XX_ETH
 	help
-	  This enables support for Port 2 of the Marvell MV64340 Gigabit
+	  This enables support for Port 2 of the Marvell MV643XX Gigabit
 	  Ethernet.
 
 endmenu
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 9e3f748eebd2..641a3d6cc866 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -95,7 +95,7 @@ obj-$(CONFIG_B44) += b44.o
 obj-$(CONFIG_FORCEDETH) += forcedeth.o
 obj-$(CONFIG_NE_H8300) += ne-h8300.o 8390.o
 
-obj-$(CONFIG_MV64340_ETH) += mv64340_eth.o
+obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o
 
 obj-$(CONFIG_PPP) += ppp_generic.o slhc.o
 obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
diff --git a/drivers/net/mv64340_eth.c b/drivers/net/mv643xx_eth.c
index 2dbec6da98fe..41d38b3b3b4f 100644
--- a/drivers/net/mv64340_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -54,7 +54,7 @@
 #include <asm/types.h>
 #include <asm/pgtable.h>
 #include <asm/system.h>
-#include "mv64340_eth.h"
+#include "mv643xx_eth.h"
 
 /*
  * The first part is the high level driver of the gigE ethernet ports. 
@@ -1425,23 +1425,23 @@ static struct net_device *mv64340_dev2;
  */
 static int __init mv64340_init_module(void)
 {
-	printk(KERN_NOTICE "MV-64340 10/100/1000 Ethernet Driver\n");
+	printk(KERN_NOTICE "MV-643xx 10/100/1000 Ethernet Driver\n");
 
-#ifdef CONFIG_MV64340_ETH_0
+#ifdef CONFIG_MV643XX_ETH_0
 	mv64340_dev0 = mv64340_eth_init(0);
 	if (!mv64340_dev0) {
 		printk(KERN_ERR
 		       "Error registering MV-64360 ethernet port 0\n");
 	}
 #endif
-#ifdef CONFIG_MV64340_ETH_1
+#ifdef CONFIG_MV643XX_ETH_1
 	mv64340_dev1 = mv64340_eth_init(1);
 	if (!mv64340_dev1) {
 		printk(KERN_ERR
 		       "Error registering MV-64360 ethernet port 1\n");
 	}
 #endif
-#ifdef CONFIG_MV64340_ETH_2
+#ifdef CONFIG_MV643XX_ETH_2
 	mv64340_dev2 = mv64340_eth_init(2);
 	if (!mv64340_dev2) {
 		printk(KERN_ERR
diff --git a/drivers/net/mv64340_eth.h b/drivers/net/mv643xx_eth.h
index 1166135ce210..46a057d0c31f 100644
--- a/drivers/net/mv64340_eth.h
+++ b/drivers/net/mv643xx_eth.h
@@ -7,7 +7,7 @@
 #include <linux/spinlock.h>
 #include <linux/workqueue.h>
 
-#include <asm/mv64340.h>
+#include <linux/mv643xx.h>
 
 #define	BIT0	0x00000001
 #define	BIT1	0x00000002
diff --git a/include/asm-mips/mv64340.h b/include/linux/mv643xx.h
index 442f2fbf7341..442f2fbf7341 100644
--- a/include/asm-mips/mv64340.h
+++ b/include/linux/mv643xx.h