aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-09-02 08:22:58 -0700
committerOlof Johansson <olof@lixom.net>2012-09-02 08:22:58 -0700
commit3729d4a41d1c706ecdfa2fb0bbf37d8ab73ec959 (patch)
treedc3e74bc96c71b163fd15558efaa9c16e6d84fae /arch
parent3800bd392ffc70cb699fbd06734ae9aabea97979 (diff)
parent497dcf6fc355f0734faf851662b6957386715d24 (diff)
downloadlinux-linaro-stable-3729d4a41d1c706ecdfa2fb0bbf37d8ab73ec959.tar.gz
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: marzen: fixup smsc911x id for regulator
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-shmobile/board-marzen.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c
index 3a528cf4366c..fcf5a47f4772 100644
--- a/arch/arm/mach-shmobile/board-marzen.c
+++ b/arch/arm/mach-shmobile/board-marzen.c
@@ -67,7 +67,7 @@ static struct smsc911x_platform_config smsc911x_platdata = {
static struct platform_device eth_device = {
.name = "smsc911x",
- .id = 0,
+ .id = -1,
.dev = {
.platform_data = &smsc911x_platdata,
},