summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2015-01-16 10:50:41 +0100
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2015-01-16 10:50:41 +0100
commita699c4f23852bad780b8ad5273d5a3171cd461f9 (patch)
treec7c751a5400402c124da6e96209c6a449ae70605 /arch/arm
parent4e87f2dd9bc258c85b2f3bb1a100b49927fbe6f3 (diff)
apalis_t30: fix soc-camera-pdrv warningColibri_T20_LinuxImageV2.3Beta7_20150203
Commit fe4c58c4b96a24aba8e27956e8158b3002723b17 adding ADV7280 support introduced the following warning being printed during boot: [ 1.121072] sysfs: cannot create duplicate filename '/devices/platform/soc-camera-pdrv.3'
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-tegra/board-apalis_t30.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/board-apalis_t30.c b/arch/arm/mach-tegra/board-apalis_t30.c
index 4d25e3df9b75..1f3f84ad132f 100644
--- a/arch/arm/mach-tegra/board-apalis_t30.c
+++ b/arch/arm/mach-tegra/board-apalis_t30.c
@@ -194,7 +194,7 @@ static struct soc_camera_link iclink_adv7280 = {
static struct platform_device soc_camera_adv7280 = {
.name = "soc-camera-pdrv",
- .id = 3,
+ .id = 2,
.dev = {
.platform_data = &iclink_adv7280,
},
@@ -226,7 +226,7 @@ static struct soc_camera_link iclink_tvp5150soc = {
static struct platform_device soc_camera_tvp5150soc = {
.name = "soc-camera-pdrv",
- .id = 2,
+ .id = 3,
.dev = {
.platform_data = &iclink_tvp5150soc,
},
@@ -258,7 +258,7 @@ static struct soc_camera_link iclink_ov7670soc = {
static struct platform_device soc_camera_ov7670soc = {
.name = "soc-camera-pdrv",
- .id = 3,
+ .id = 4,
.dev = {
.platform_data = &iclink_ov7670soc,
},
@@ -296,7 +296,7 @@ static struct soc_camera_link iclink_as0260soc = {
static struct platform_device soc_camera_as0260soc = {
.name = "soc-camera-pdrv",
- .id = 4,
+ .id = 5,
.dev = {
.platform_data = &iclink_as0260soc,
},