Merge branch 'for-2.6.39' into for-2.6.40 (f030d60b) · Commits · e / devices / android_kernel_xiaomi_markw

arch/arm/mach-s3c2440/mach-gta02.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -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,
		&gta02_dfbmcs320_device,
		&gta02_buttons_device,
		&s3c_device_adc,
		&s3c_device_ts,