diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-01-05 13:05:51 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-01-05 13:05:51 -0500 |
| commit | fda87903f4e9caf87e02d52768c2611e417b7efb (patch) | |
| tree | bd2f84361699651cce5661bcfe60e3fe5ee91517 /arch/arm/mach-s5pv210 | |
| parent | 1a0703ede4493bd74f9c6b53f782b749e175a88e (diff) | |
| parent | 2de0dbc5f6830e7659083d1929f57cb88b16a3b6 (diff) | |
Merge branch 'gpio-for-grant' of git://sources.calxeda.com/kernel/linux into gpio/next
Conflicts:
drivers/gpio/gpio-pl061.c
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 a9106c392398..8662ef6e5681 100644 --- a/arch/arm/mach-s5pv210/mach-smdkv210.c +++ b/arch/arm/mach-s5pv210/mach-smdkv210.c | |||
| @@ -273,6 +273,7 @@ static struct samsung_bl_gpio_info smdkv210_bl_gpio_info = { | |||
| 273 | 273 | ||
| 274 | static struct platform_pwm_backlight_data smdkv210_bl_data = { | 274 | static struct platform_pwm_backlight_data smdkv210_bl_data = { |
| 275 | .pwm_id = 3, | 275 | .pwm_id = 3, |
| 276 | .pwm_period_ns = 1000, | ||
| 276 | }; | 277 | }; |
| 277 | 278 | ||
| 278 | static void __init smdkv210_map_io(void) | 279 | static void __init smdkv210_map_io(void) |