diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 07:55:03 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 07:55:03 -0500 |
| commit | 4c5f830c4c9d4f19c1eef356c0cd322b46d695c9 (patch) | |
| tree | a14ad6c652736bb28859a7aec392a01b236ae58d /arch/arm/mach-s5pv210 | |
| parent | cc511b8d84d88ab788cddbfe8d21485b1c387493 (diff) | |
| parent | 2e3d256de9d3db5a7ca19b61305627a516b54b45 (diff) | |
Merge branch 'for-russell' of git://hansjkoch.de/git/linux-tcc into HEAD
Conflicts:
arch/arm/plat-omap/include/plat/common.h
Diffstat (limited to 'arch/arm/mach-s5pv210')
| -rw-r--r-- | arch/arm/mach-s5pv210/mach-smdkv210.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-s5pv210/mach-smdkv210.c index bc35e8261e5b..194c3b0626b5 100644 --- a/arch/arm/mach-s5pv210/mach-smdkv210.c +++ b/arch/arm/mach-s5pv210/mach-smdkv210.c | |||
| @@ -274,6 +274,7 @@ static struct samsung_bl_gpio_info smdkv210_bl_gpio_info = { | |||
| 274 | 274 | ||
| 275 | static struct platform_pwm_backlight_data smdkv210_bl_data = { | 275 | static struct platform_pwm_backlight_data smdkv210_bl_data = { |
| 276 | .pwm_id = 3, | 276 | .pwm_id = 3, |
| 277 | .pwm_period_ns = 1000, | ||
| 277 | }; | 278 | }; |
| 278 | 279 | ||
| 279 | static void __init smdkv210_map_io(void) | 280 | static void __init smdkv210_map_io(void) |