diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-03-23 12:05:01 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-03-23 12:05:01 +0100 |
| commit | ce24f58a1187ca3058d72c3f897e3b574209ab20 (patch) | |
| tree | f84384469aca4c6660c4f12bee3e99deb16221ec /arch/arm/mach-s3c2440 | |
| parent | 5a8826463c19b0d1a2fc60b2adac0ec318047844 (diff) | |
| parent | 333802e90d3f0366c4a1cb767e2783d2e1df73a8 (diff) | |
| download | linux-ce24f58a1187ca3058d72c3f897e3b574209ab20.tar.bz2 | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'arch/arm/mach-s3c2440')
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-mini2440.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2440/mach-mini2440.c b/arch/arm/mach-s3c2440/mach-mini2440.c index f62bb4c793bd..7c3fb071ddd6 100644 --- a/arch/arm/mach-s3c2440/mach-mini2440.c +++ b/arch/arm/mach-s3c2440/mach-mini2440.c @@ -506,6 +506,11 @@ static struct i2c_board_info mini2440_i2c_devs[] __initdata = { }, }; +static struct platform_device uda1340_codec = { + .name = "uda134x-codec", + .id = -1, +}; + static struct platform_device *mini2440_devices[] __initdata = { &s3c_device_ohci, &s3c_device_wdt, @@ -521,7 +526,9 @@ static struct platform_device *mini2440_devices[] __initdata = { &s3c_device_nand, &s3c_device_sdi, &s3c_device_iis, + &uda1340_codec, &mini2440_audio, + &samsung_asoc_dma, }; static void __init mini2440_map_io(void) |