diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-10-25 04:00:30 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-10-25 04:00:30 -0400 |
| commit | aa5c14d5c0d3e4c587db4a1b220b9c86415c538f (patch) | |
| tree | 0114637e8be2b38176e7e91e6cea3501b22cb66a /drivers/input/misc | |
| parent | 79fc84c7e0d2fe89c4e82f3a26fd8b0d13c31703 (diff) | |
| parent | b11bdb5254ff17cb63e4ae5088b73fdcd2cc2602 (diff) | |
Merge branch 'topic/asoc' into for-linus
Conflicts:
arch/powerpc/platforms/85xx/p1022_ds.c
Diffstat (limited to 'drivers/input/misc')
| -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"); |