diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-13 10:37:18 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-13 10:37:18 -0700 |
| commit | f030d60b30855e18ac5bf080fa9e576147623d18 (patch) | |
| tree | 60bab12db78f0cf3b9fcf98f4b738be154577ce9 /arch/arm | |
| parent | 674479124f8cbc4b5507d914ccd63ad08fd5326e (diff) | |
| parent | 6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff) | |
Merge branch 'for-2.6.39' into for-2.6.40
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-gta02.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c index 0db2411ef4b..716662008ce 100644 --- a/arch/arm/mach-s3c2440/mach-gta02.c +++ b/arch/arm/mach-s3c2440/mach-gta02.c @@ -409,6 +409,10 @@ struct platform_device s3c24xx_pwm_device = { .num_resources = 0, }; +static struct platform_device gta02_dfbmcs320_device = { + .name = "dfbmcs320", +}; + static struct i2c_board_info gta02_i2c_devs[] __initdata = { { I2C_BOARD_INFO("pcf50633", 0x73), @@ -523,6 +527,7 @@ static struct platform_device *gta02_devices[] __initdata = { &s3c_device_iis, &samsung_asoc_dma, &s3c_device_i2c0, + >a02_dfbmcs320_device, >a02_buttons_device, &s3c_device_adc, &s3c_device_ts, |