diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-06 10:11:46 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-06 10:11:46 +0100 |
| commit | 90b4d60c6103105a634c495003c2ce931f075f63 (patch) | |
| tree | 033f07fb175a5e0651f6a63fc0fe8e1860555ce5 /arch/arm/mach-at91/at91sam9260_devices.c | |
| parent | bac91462e8a8609d7be02a2cbf5c2b406b04ed9f (diff) | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
| download | blackbird-op-linux-90b4d60c6103105a634c495003c2ce931f075f63.tar.gz blackbird-op-linux-90b4d60c6103105a634c495003c2ce931f075f63.zip | |
Merge tag 'v3.7-rc3' into HEAD
Linux 3.7-rc3
Diffstat (limited to 'arch/arm/mach-at91/at91sam9260_devices.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9260_devices.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c index 0f24cfb9e54a..46edfaf275f7 100644 --- a/arch/arm/mach-at91/at91sam9260_devices.c +++ b/arch/arm/mach-at91/at91sam9260_devices.c @@ -389,7 +389,7 @@ static struct i2c_gpio_platform_data pdata = { static struct platform_device at91sam9260_twi_device = { .name = "i2c-gpio", - .id = -1, + .id = 0, .dev.platform_data = &pdata, }; @@ -421,7 +421,7 @@ static struct resource twi_resources[] = { }; static struct platform_device at91sam9260_twi_device = { - .id = -1, + .id = 0, .resource = twi_resources, .num_resources = ARRAY_SIZE(twi_resources), }; |
