diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-29 08:46:28 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-29 08:46:28 -0700 |
| commit | 94b086b243e112030b815b76e61de6523e6fc700 (patch) | |
| tree | 3c7f2308e7e5afdb276a858c4960754168a92d8c /arch/arm/mach-at91/at91sam9rl_devices.c | |
| parent | 967857dfd990081f6702daebc6c9bc6f4ba7a39e (diff) | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
Merge 3.7-rc3 into driver-core-next
This pulls in the various driver core changes that were in 3.7-rc3 into the
driver-core-next branch.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/mach-at91/at91sam9rl_devices.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9rl_devices.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c index d6ca0543ce8..5047bdc92ad 100644 --- a/arch/arm/mach-at91/at91sam9rl_devices.c +++ b/arch/arm/mach-at91/at91sam9rl_devices.c @@ -314,7 +314,7 @@ static struct i2c_gpio_platform_data pdata = { static struct platform_device at91sam9rl_twi_device = { .name = "i2c-gpio", - .id = -1, + .id = 0, .dev.platform_data = &pdata, }; @@ -347,7 +347,7 @@ static struct resource twi_resources[] = { static struct platform_device at91sam9rl_twi_device = { .name = "i2c-at91sam9g20", - .id = -1, + .id = 0, .resource = twi_resources, .num_resources = ARRAY_SIZE(twi_resources), }; |