aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorSven Rebhan <odinshorse@googlemail.com>2009-02-23 01:21:52 +0000
committerAndy Green <agreen@octopus.localdomain>2009-02-23 01:21:52 +0000
commit7c9df2ef815eaa70df86e0300f99c8b692627abd (patch)
tree6433ecee3ca14ee0a0d955e293d10c808a44cb3d /arch
parent2afd3a23f701a7a840b740f7977c7dc46e497dfc (diff)
Allow disabling of GTA02 vibrator
If the vibrator is disabled we don't need to register a platform device. Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-s3c2442/mach-gta02.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c
index 6f32ccfbf26..91e752db267 100644
--- a/arch/arm/mach-s3c2442/mach-gta02.c
+++ b/arch/arm/mach-s3c2442/mach-gta02.c
@@ -794,6 +794,8 @@ struct platform_device bq27000_battery_device = {
};
#endif
+
+#ifdef CONFIG_LEDS_NEO1973_VIBRATOR
/* vibrator (child of FIQ) */
static struct resource gta02_vibrator_resources[] = {
@@ -816,6 +818,7 @@ static struct platform_device gta02_vibrator_dev = {
.platform_data = &gta02_vib_pdata,
},
};
+#endif
/* NOR Flash */
@@ -1699,13 +1702,14 @@ static void __init gta02_machine_init(void)
pm_power_off = gta02_poweroff;
/* Register the HDQ and vibrator as children of pwm device */
- gta02_vibrator_dev.dev.parent = &s3c24xx_pwm_device.dev;
- platform_device_register(&gta02_vibrator_dev);
#ifdef CONFIG_HDQ_GPIO_BITBANG
gta02_hdq_device.dev.parent = &s3c24xx_pwm_device.dev;
platform_device_register(&gta02_hdq_device);
#endif
-
+#ifdef CONFIG_LEDS_NEO1973_VIBRATOR
+ gta02_vibrator_dev.dev.parent = &s3c24xx_pwm_device.dev;
+ platform_device_register(&gta02_vibrator_dev);
+#endif
}
void DEBUG_LED(int n)