git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v2.6.39-rc6' into x86/cleanups
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c2440
/
mach-gta02.c
diff --git
a/arch/arm/mach-s3c2440/mach-gta02.c
b/arch/arm/mach-s3c2440/mach-gta02.c
index
0db2411
..
7166620
100644
(file)
--- 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,
};
.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),
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,
&s3c_device_iis,
&samsung_asoc_dma,
&s3c_device_i2c0,
+ >a02_dfbmcs320_device,
>a02_buttons_device,
&s3c_device_adc,
&s3c_device_ts,
>a02_buttons_device,
&s3c_device_adc,
&s3c_device_ts,