diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2010-10-25 10:00:30 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-10-25 10:00:30 +0200 |
| commit | aa5c14d5c0d3e4c587db4a1b220b9c86415c538f (patch) | |
| tree | 0114637e8be2b38176e7e91e6cea3501b22cb66a /arch/arm/mach-kirkwood | |
| parent | Merge branch 'topic/misc' into for-linus (diff) | |
| parent | Merge branch 'for-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into topic/asoc (diff) | |
| download | linux-dev-aa5c14d5c0d3e4c587db4a1b220b9c86415c538f.tar.xz linux-dev-aa5c14d5c0d3e4c587db4a1b220b9c86415c538f.zip | |
Merge branch 'topic/asoc' into for-linus
Conflicts:
arch/powerpc/platforms/85xx/p1022_ds.c
Diffstat (limited to 'arch/arm/mach-kirkwood')
| -rw-r--r-- | arch/arm/mach-kirkwood/common.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c index 1c82d4290dad..51ff23b72d3a 100644 --- a/arch/arm/mach-kirkwood/common.c +++ b/arch/arm/mach-kirkwood/common.c @@ -903,10 +903,16 @@ static struct platform_device kirkwood_i2s_device = { }, }; +static struct platform_device kirkwood_pcm_device = { + .name = "kirkwood-pcm-audio", + .id = -1, +}; + void __init kirkwood_audio_init(void) { kirkwood_clk_ctrl |= CGC_AUDIO; platform_device_register(&kirkwood_i2s_device); + platform_device_register(&kirkwood_pcm_device); } /***************************************************************************** |