diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-19 09:00:06 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-19 09:00:06 +0200 |
| commit | 4c8440666b995f20604852b35dcfdbcc1d5931f1 (patch) | |
| tree | b3b6cd65ee275ba1adf9d2c050063f30ebbadb91 /arch/arm/mach-s3c2440/mach-gta02.c | |
| parent | powerpc: Remove unused/obsolete CONFIG_XICS (diff) | |
| parent | powerpc/4xx: Fix regression in SMP on 476 (diff) | |
| download | linux-4c8440666b995f20604852b35dcfdbcc1d5931f1.tar.xz linux-4c8440666b995f20604852b35dcfdbcc1d5931f1.zip | |
Merge branch 'merge' into next
Diffstat (limited to 'arch/arm/mach-s3c2440/mach-gta02.c')
| -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 0db2411ef4bb..716662008ce2 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, |