diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-01 12:48:23 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-01 12:48:23 +1000 |
| commit | 8e49fbd70c5888996be433512ab44666af708a23 (patch) | |
| tree | f7ee567bd8e35a785992c18c80883b5b6570b3d4 /arch/mips | |
| parent | a07527daf4b80514fb8b898f073c843187e47f80 (diff) | |
| parent | 135e44aaa47c22b66c8d2acb54da1106a6c17598 (diff) | |
Merge remote branch 'sound-asoc/for-next'
Conflicts:
drivers/video/sh_mobile_hdmi.c
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/alchemy/devboards/db1200/platform.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/mips/alchemy/devboards/db1200/platform.c b/arch/mips/alchemy/devboards/db1200/platform.c index 3fa34c3abc04..fbb55935b99e 100644 --- a/arch/mips/alchemy/devboards/db1200/platform.c +++ b/arch/mips/alchemy/devboards/db1200/platform.c @@ -429,6 +429,11 @@ static struct platform_device db1200_audio_dev = { .resource = au1200_psc1_res, }; +static struct platform_device db1200_stac_dev = { + .name = "ac97-codec", + .id = 1, /* on PSC1 */ +}; + static struct platform_device *db1200_devs[] __initdata = { NULL, /* PSC0, selected by S6.8 */ &db1200_ide_dev, @@ -436,6 +441,7 @@ static struct platform_device *db1200_devs[] __initdata = { &db1200_rtc_dev, &db1200_nand_dev, &db1200_audio_dev, + &db1200_stac_dev, }; static int __init db1200_dev_init(void) |