diff options
Diffstat (limited to 'arch/arm')
| -rwxr-xr-x | arch/arm/mach-tegra/board-nvodm.c | 10 | ||||
| -rwxr-xr-x[-rw-r--r--] | arch/arm/mach-tegra/vibrate.c | 2 |
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, }; |