From f91480920594a5205c41dc886309d3baf3bd3694 Mon Sep 17 00:00:00 2001
From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Thu, 24 Apr 2008 01:27:44 +0200
Subject: [PATCH] --- yaml --- r: 96213 b: refs/heads/master c:
 240e4419e0cfcba737883b637ec2bdcc071ea03d h: refs/heads/master i:   96211:
 cc827ff7611752b283d32e61ceb6d6fd6bf8a7a9 v: v3

---
 [refs]                            | 2 +-
 trunk/include/linux/mv643xx_eth.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 72a39740dd8f..972a8fb5745d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c416a41f99be190e1f558cb06f70ddd560ce8b4b
+refs/heads/master: 240e4419e0cfcba737883b637ec2bdcc071ea03d
diff --git a/trunk/include/linux/mv643xx_eth.h b/trunk/include/linux/mv643xx_eth.h
index 9f3a6032ff2e..66dc9571922a 100644
--- a/trunk/include/linux/mv643xx_eth.h
+++ b/trunk/include/linux/mv643xx_eth.h
@@ -7,8 +7,8 @@
 
 #include <linux/mbus.h>
 
-#define MV643XX_ETH_SHARED_NAME		"mv643xx_eth_shared"
-#define MV643XX_ETH_NAME		"mv643xx_eth"
+#define MV643XX_ETH_SHARED_NAME		"mv643xx_eth"
+#define MV643XX_ETH_NAME		"mv643xx_eth_port"
 #define MV643XX_ETH_SHARED_REGS		0x2000
 #define MV643XX_ETH_SHARED_REGS_SIZE	0x2000
 #define MV643XX_ETH_BAR_4		0x2220