aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2009-11-10 01:41:52 +0100
committerLars-Peter Clausen <lars@metafoo.de>2009-11-10 01:41:52 +0100
commit7210ee5b3abe280f6ef06b26381c93a7f2570837 (patch)
tree9cffe470d1195fe43036c782bde44976704eb0f4
parent4f8d92b3915e308cbb6d07478e08eca2b93cd96f (diff)
parenta03f58c61cb66164aa40cbf7bf3ff5f24a6f658b (diff)
Merge branch 'om-gta02-2.6.31' into om-2.6.31
-rw-r--r--arch/arm/mach-s3c2442/mach-gta02.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c
index eed207a5956..aea46cd2ce9 100644
--- a/arch/arm/mach-s3c2442/mach-gta02.c
+++ b/arch/arm/mach-s3c2442/mach-gta02.c
@@ -470,7 +470,11 @@ static struct regulator_consumer_supply ldo6_consumers[] = {
static struct pcf50633_bl_platform_data gta02_backlight_data = {
.default_brightness = 0x3f,
+#ifdef CONFIG_BACKLIGHT_PCF50633
.default_brightness_limit = 0,
+#else
+ .default_brightness_limit = 0x3f,
+#endif
.ramp_time = 3,
};
@@ -828,7 +832,9 @@ static struct platform_device gta02_leds_device = {
/* JBT6k74 display controller */
static void gta02_jbt6k74_probe_completed(struct device *dev)
{
+#ifdef CONFIG_BACKLIGHT_PCF50633
pcf50633_bl_set_brightness_limit(gta02_pcf, 0x3f);
+#endif
}
const struct jbt6k74_platform_data jbt6k74_pdata = {