diff options
| author | Tom Cherry <tcherry@nvidia.com> | 2012-06-05 11:41:56 -0700 |
|---|---|---|
| committer | Tom Cherry <tcherry@nvidia.com> | 2012-06-05 11:41:56 -0700 |
| commit | b46bcc0a3da47431f2711c3d63e9507cfab18ecd (patch) | |
| tree | 6b9355395470108f5161840638bf48af0e10f3c1 /arch/arm/mach-tegra/devices.c | |
| parent | 63fb092060747250a0dd305bd11018caebe23d65 (diff) | |
| parent | f61bdbde09605793cfa05f7c59545c62b5e08aa6 (diff) | |
Merge commit 'main-ics-2012.06.04-A5' into HEAD
Conflicts:
drivers/media/video/tegra/nvavp/nvavp_dev.c
Change-Id: I7779b0ce58004f80cccf6193148ac49551ce5da5
Diffstat (limited to 'arch/arm/mach-tegra/devices.c')
| -rw-r--r-- | arch/arm/mach-tegra/devices.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/devices.c b/arch/arm/mach-tegra/devices.c index 377772ff4291..44afd0e63fe4 100644 --- a/arch/arm/mach-tegra/devices.c +++ b/arch/arm/mach-tegra/devices.c @@ -1166,6 +1166,11 @@ struct platform_device tegra_pcm_device = { .id = -1, }; +struct platform_device tegra_tdm_pcm_device = { + .name = "tegra-tdm-pcm-audio", + .id = -1, +}; + static struct resource w1_resources[] = { [0] = { .start = INT_OWR, |