diff options
| author | Vinod G <vinodg@nvidia.com> | 2011-03-03 14:57:08 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-04-26 15:52:27 -0700 |
| commit | bbb78899bfdd81ecff3ba75e6e0b8418001a9af0 (patch) | |
| tree | e2d8dae068a012b8c93792335e13de034ac182b4 /arch/arm/mach-tegra/devices.c | |
| parent | 5be1dd4dd04db4a4c4e8004e364d504bf9f56857 (diff) | |
arm: tegra: Merge changes from main branch
Changes specific to separate the codecs based on board are
integrated from rel-2010-11 branch
Original-Change-Id: I9fe2e05d5347f02cd3047f453d03437b735e2c4b
Reviewed-on: http://git-master/r/21562
Reviewed-by: Vinod Gopalakrishnakurup <vinodg@nvidia.com>
Tested-by: Vinod Gopalakrishnakurup <vinodg@nvidia.com>
Reviewed-by: Scott Peterson <speterson@nvidia.com>
Tested-by: Scott Peterson <speterson@nvidia.com>
Change-Id: I06473d906c1043a8fcc511cd66cfb57e311afdae
Diffstat (limited to 'arch/arm/mach-tegra/devices.c')
| -rw-r--r-- | arch/arm/mach-tegra/devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/devices.c b/arch/arm/mach-tegra/devices.c index eb7b50531a44..bdf3b0ce8929 100644 --- a/arch/arm/mach-tegra/devices.c +++ b/arch/arm/mach-tegra/devices.c @@ -612,7 +612,7 @@ static struct resource audio_resource[] = { struct platform_device tegra_audio_device = { .name = "audio", - .id = -1, + .id = 1, .resource = audio_resource, .num_resources = ARRAY_SIZE(audio_resource), }; |