diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-02 11:22:58 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-02 11:22:58 -0400 |
| commit | 3729d4a41d1c706ecdfa2fb0bbf37d8ab73ec959 (patch) | |
| tree | dc3e74bc96c71b163fd15558efaa9c16e6d84fae | |
| parent | 3800bd392ffc70cb699fbd06734ae9aabea97979 (diff) | |
| parent | 497dcf6fc355f0734faf851662b6957386715d24 (diff) | |
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
| -rw-r--r-- | arch/arm/mach-shmobile/board-marzen.c | 2 |
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 = { | |||
| 67 | 67 | ||
| 68 | static struct platform_device eth_device = { | 68 | static struct platform_device eth_device = { |
| 69 | .name = "smsc911x", | 69 | .name = "smsc911x", |
| 70 | .id = 0, | 70 | .id = -1, |
| 71 | .dev = { | 71 | .dev = { |
| 72 | .platform_data = &smsc911x_platdata, | 72 | .platform_data = &smsc911x_platdata, |
| 73 | }, | 73 | }, |