diff options
| author | Vinod G <vinodg@nvidia.com> | 2011-03-03 14:57:08 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:42:23 -0800 |
| commit | 366f69731d268661f27285fbc38ba24f87fbe628 (patch) | |
| tree | b8a47b53db4a08b311579ab73b2ff28d49819b06 /arch/arm/mach-tegra/devices.c | |
| parent | c24b6421ce88af711b895c7d83a904bd4a4196e3 (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>
Original-Change-Id: I06473d906c1043a8fcc511cd66cfb57e311afdae
Rebase-Id: R35499b0a4c1a947e119383b53e9843f23c18cf88
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 8a02244e3a0d..d38d540a1e1e 100644 --- a/arch/arm/mach-tegra/devices.c +++ b/arch/arm/mach-tegra/devices.c @@ -736,7 +736,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), }; |