diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-11-20 18:19:10 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-11-20 18:19:10 +0900 |
| commit | 840ed42942cc1ebbda2ed55f4019673b537fc5de (patch) | |
| tree | 415644488e3966837eeb5061d96d4ca7db862318 /arch/arm/mach-at91/at91sam9261_devices.c | |
| parent | 0dca30003bc752b2fc15906e562ef4e4925725fd (diff) | |
| parent | 0a9d5ac307aefbb2c772537d3fe7f75046d563ac (diff) | |
| download | talos-op-linux-840ed42942cc1ebbda2ed55f4019673b537fc5de.tar.gz talos-op-linux-840ed42942cc1ebbda2ed55f4019673b537fc5de.zip | |
Merge branch 'next/hdmi-samsung' into next/devel-samsung
Diffstat (limited to 'arch/arm/mach-at91/at91sam9261_devices.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9261_devices.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c index 9752f17efba9..b9487696b7be 100644 --- a/arch/arm/mach-at91/at91sam9261_devices.c +++ b/arch/arm/mach-at91/at91sam9261_devices.c @@ -285,7 +285,7 @@ static struct i2c_gpio_platform_data pdata = { static struct platform_device at91sam9261_twi_device = { .name = "i2c-gpio", - .id = -1, + .id = 0, .dev.platform_data = &pdata, }; @@ -317,7 +317,7 @@ static struct resource twi_resources[] = { }; static struct platform_device at91sam9261_twi_device = { - .id = -1, + .id = 0, .resource = twi_resources, .num_resources = ARRAY_SIZE(twi_resources), }; |
