diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 09:19:22 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 09:19:22 -0400 |
| commit | f13b1035ce8bbc27d4ce7c281cddd2718f2cf5b0 (patch) | |
| tree | 44419bd03c33e662302dd003f57d36e133144f91 /drivers/misc | |
| parent | e910b63d009701ad4ebbeb089aba35707fa5d68e (diff) | |
| parent | 5da3e714e30d40145f4dd37d79de6bbbcb9e6137 (diff) | |
Merge branch 'shmobile' into devel
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/cs5535-mfgpt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/cs5535-mfgpt.c b/drivers/misc/cs5535-mfgpt.c index 9bec24db4d4..2d44b330010 100644 --- a/drivers/misc/cs5535-mfgpt.c +++ b/drivers/misc/cs5535-mfgpt.c | |||
| @@ -366,6 +366,6 @@ static int __init cs5535_mfgpt_init(void) | |||
| 366 | 366 | ||
| 367 | module_init(cs5535_mfgpt_init); | 367 | module_init(cs5535_mfgpt_init); |
| 368 | 368 | ||
| 369 | MODULE_AUTHOR("Andres Salomon <dilinger@collabora.co.uk>"); | 369 | MODULE_AUTHOR("Andres Salomon <dilinger@queued.net>"); |
| 370 | MODULE_DESCRIPTION("CS5535/CS5536 MFGPT timer driver"); | 370 | MODULE_DESCRIPTION("CS5535/CS5536 MFGPT timer driver"); |
| 371 | MODULE_LICENSE("GPL"); | 371 | MODULE_LICENSE("GPL"); |