summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c24xx/mach-h1940.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2013-12-10 07:22:40 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-12-10 07:22:40 +0100
commit5d43889c07bb38694742936aa70d1187c012e198 (patch)
tree73809dddae39ae3b746396e9779142dbd1973f33 /arch/arm/mach-s3c24xx/mach-h1940.c
parentInput: ALPS - add support for DualPoint device on Dell XT2 model (diff)
parentLinux 3.13-rc3 (diff)
downloadlinux-5d43889c07bb38694742936aa70d1187c012e198.tar.xz
linux-5d43889c07bb38694742936aa70d1187c012e198.zip
Merge tag 'v3.13-rc3' into for-linus
Merging with the mainline to sync up on changes to serio core.
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-h1940.c')
-rw-r--r--arch/arm/mach-s3c24xx/mach-h1940.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-h1940.c b/arch/arm/mach-s3c24xx/mach-h1940.c
index 74dd47988b41..952b6a040d1f 100644
--- a/arch/arm/mach-s3c24xx/mach-h1940.c
+++ b/arch/arm/mach-s3c24xx/mach-h1940.c
@@ -504,6 +504,7 @@ static struct platform_pwm_backlight_data backlight_data = {
.dft_brightness = 50,
/* tcnt = 0x31 */
.pwm_period_ns = 36296,
+ .enable_gpio = -1,
.init = h1940_backlight_init,
.notify = h1940_backlight_notify,
.exit = h1940_backlight_exit,