summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2008-04-24 01:27:44 +0200
committerDale Farnsworth <dale@farnsworth.org>2008-04-28 21:17:07 -0700
commit240e4419e0cfcba737883b637ec2bdcc071ea03d (patch)
treed0e43342a339907fa38b56c7bf470d3f63471e50 /include/linux
parentc416a41f99be190e1f558cb06f70ddd560ce8b4b (diff)
downloadop-kernel-dev-240e4419e0cfcba737883b637ec2bdcc071ea03d.zip
op-kernel-dev-240e4419e0cfcba737883b637ec2bdcc071ea03d.tar.gz
mv643xx_eth: shorten shared platform driver name
Change the MV643XX_ETH_SHARED_NAME platform driver name to something shorter than 19 characters, so that we can register multiple (otherwise we end up with sysfs conflicts since all instances will map to "mv643xx_eth_shared." as there is a 20-char sysfs file name limit.) Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Acked-by: Nicolas Pitre <nico@marvell.com> Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/mv643xx_eth.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mv643xx_eth.h b/include/linux/mv643xx_eth.h
index 9f3a603..66dc957 100644
--- a/include/linux/mv643xx_eth.h
+++ b/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
OpenPOWER on IntegriCloud