From: Kukjin Kim <kgene.kim@samsung.com>
Date: Fri, 11 Mar 2011 06:48:52 +0000 (+0900)
Subject: Merge branch 'dev/pwm-backlight' into for-next
X-Git-Tag: v2.6.39-rc1~434^2^2~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d2f42cc275ba72a47ce6933b18480163ecf2740;p=thirdparty%2Flinux.git

Merge branch 'dev/pwm-backlight' into for-next

Conflicts:
	arch/arm/mach-s3c64xx/mach-smdk6410.c
---

6d2f42cc275ba72a47ce6933b18480163ecf2740
diff --cc arch/arm/mach-s3c64xx/mach-smdk6410.c
index a80a3163dd303,6639cced5f798..686a4f270b123
--- a/arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c
@@@ -28,7 -28,7 +28,8 @@@
  #include <linux/delay.h>
  #include <linux/smsc911x.h>
  #include <linux/regulator/fixed.h>
 +#include <linux/regulator/machine.h>
+ #include <linux/pwm_backlight.h>
  
  #ifdef CONFIG_SMDK6410_WM1190_EV1
  #include <linux/mfd/wm8350/core.h>