diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-07-19 09:29:30 +0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-07-19 09:29:30 +0400 |
| commit | 23c7301d74ac2d80d0dafd6f84a6d11a0fc15ce5 (patch) | |
| tree | f19bb1ffa448f4a6c1581f5a69291cffb077deab /arch/arm/mach-s5pv210/mach-goni.c | |
| parent | 84a1caf1453c3d44050bd22db958af4a7f99315c (diff) | |
| parent | 6bba0caf5883ebc1430df38551bbb77ce05d4659 (diff) | |
| download | linux-23c7301d74ac2d80d0dafd6f84a6d11a0fc15ce5.tar.xz | |
Merge branch 'next/board-samsung-2' into next/board-samsung-3
Diffstat (limited to 'arch/arm/mach-s5pv210/mach-goni.c')
| -rw-r--r-- | arch/arm/mach-s5pv210/mach-goni.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c index bf5087c2b7fe..b2cae1387869 100644 --- a/arch/arm/mach-s5pv210/mach-goni.c +++ b/arch/arm/mach-s5pv210/mach-goni.c @@ -859,12 +859,19 @@ static struct s5p_platform_fimc goni_fimc_md_platdata __initdata = { .num_clients = ARRAY_SIZE(goni_camera_sensors), }; +/* Audio device */ +static struct platform_device goni_device_audio = { + .name = "smdk-audio", + .id = -1, +}; + static struct platform_device *goni_devices[] __initdata = { &s3c_device_fb, &s5p_device_onenand, &goni_spi_gpio, &goni_i2c_gpio_pmic, &goni_i2c_gpio5, + &goni_device_audio, &mmc2_fixed_voltage, &goni_device_gpiokeys, &s5p_device_mfc, |