diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/input/misc/twl4030-vibra.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/input/misc/twl4030-vibra.c')
| -rw-r--r-- | drivers/input/misc/twl4030-vibra.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c index 4f9b2afc24e8..014dd4ad0d4f 100644 --- a/drivers/input/misc/twl4030-vibra.c +++ b/drivers/input/misc/twl4030-vibra.c | |||
| @@ -271,7 +271,7 @@ static struct platform_driver twl4030_vibra_driver = { | |||
| 271 | .probe = twl4030_vibra_probe, | 271 | .probe = twl4030_vibra_probe, |
| 272 | .remove = __devexit_p(twl4030_vibra_remove), | 272 | .remove = __devexit_p(twl4030_vibra_remove), |
| 273 | .driver = { | 273 | .driver = { |
| 274 | .name = "twl4030_codec_vibra", | 274 | .name = "twl4030-vibra", |
| 275 | .owner = THIS_MODULE, | 275 | .owner = THIS_MODULE, |
| 276 | #ifdef CONFIG_PM | 276 | #ifdef CONFIG_PM |
| 277 | .pm = &twl4030_vibra_pm_ops, | 277 | .pm = &twl4030_vibra_pm_ops, |
| @@ -291,7 +291,7 @@ static void __exit twl4030_vibra_exit(void) | |||
| 291 | } | 291 | } |
| 292 | module_exit(twl4030_vibra_exit); | 292 | module_exit(twl4030_vibra_exit); |
| 293 | 293 | ||
| 294 | MODULE_ALIAS("platform:twl4030_codec_vibra"); | 294 | MODULE_ALIAS("platform:twl4030-vibra"); |
| 295 | 295 | ||
| 296 | MODULE_DESCRIPTION("TWL4030 Vibra driver"); | 296 | MODULE_DESCRIPTION("TWL4030 Vibra driver"); |
| 297 | MODULE_LICENSE("GPL"); | 297 | MODULE_LICENSE("GPL"); |