summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorVenu Byravarasu <vbyravarasu@nvidia.com>2010-08-31 11:00:52 +0530
committerBharat Nihalani <bnihalani@nvidia.com>2010-08-31 03:49:09 -0700
commit9b19c94aafed014ce68ee16df37897c437dd8c68 (patch)
tree8a2e20dc9290a528a3d34147fc6ce60c8853b1f9 /arch
parent66ca1f58150a96167143b1f43f76110d770f6251 (diff)
tegra vibrator: Fixing vibrator issues on froyo+K32
1. Changing name field of tegra_vibrator to vibrator 2. Removing vibrator references from board-nvodm.c bug: 702248 Tested on: whistler Change-Id: Ie323e2ee74c4f89b0505f6e3aed1d87f57b388c8 Reviewed-on: http://git-master/r/5795 Tested-by: Venu Byravarasu <vbyravarasu@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'arch')
-rwxr-xr-xarch/arm/mach-tegra/board-nvodm.c10
-rwxr-xr-x[-rw-r--r--]arch/arm/mach-tegra/vibrate.c2
2 files changed, 1 insertions, 11 deletions
diff --git a/arch/arm/mach-tegra/board-nvodm.c b/arch/arm/mach-tegra/board-nvodm.c
index 81fd9876d9d2..ae04dcdfcdeb 100755
--- a/arch/arm/mach-tegra/board-nvodm.c
+++ b/arch/arm/mach-tegra/board-nvodm.c
@@ -1155,13 +1155,6 @@ static struct platform_device tegra_scrollwheel_device = {
};
#endif
-#ifdef CONFIG_TEGRA_ODM_VIBRATE
-static struct platform_device tegra_vibrator_device = {
- .name = "tegra_vibrator",
- .id = -1,
-};
-#endif
-
static struct platform_device *nvodm_devices[] __initdata = {
#ifdef CONFIG_RTC_DRV_TEGRA
&tegra_rtc_device,
@@ -1187,9 +1180,6 @@ static struct platform_device *nvodm_devices[] __initdata = {
#ifdef CONFIG_INPUT_TEGRA_ODM_ACCEL
&tegra_accelerometer_device,
#endif
-#ifdef CONFIG_TEGRA_ODM_VIBRATE
- &tegra_vibrator_device,
-#endif
};
#ifdef CONFIG_SPI_TEGRA
diff --git a/arch/arm/mach-tegra/vibrate.c b/arch/arm/mach-tegra/vibrate.c
index 9820ee1f051b..ca348f1f8895 100644..100755
--- a/arch/arm/mach-tegra/vibrate.c
+++ b/arch/arm/mach-tegra/vibrate.c
@@ -64,7 +64,7 @@ static int vibrator_get_time(struct timed_output_dev *dev)
static struct timed_output_dev tegra_vibrator = {
- .name = "tegra_vibrator",
+ .name = "vibrator",
.get_time = vibrator_get_time,
.enable = vibrator_enable,
};