diff options
author | Paul Mackerras <paulus@samba.org> | 2008-12-16 14:38:58 +1100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-12-16 14:38:58 +1100 |
commit | 1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a (patch) | |
tree | 0cf88547108a750d6eb910564ef5bf0ffb5ceef3 /drivers/serial/s3c2440.c | |
parent | 91cac623262c1c0cd298c5c648a8bd2b647c264d (diff) | |
parent | 23e0e8afafd9ac065d81506524adf3339584044b (diff) |
Merge branch 'merge' into next
Diffstat (limited to 'drivers/serial/s3c2440.c')
-rw-r--r-- | drivers/serial/s3c2440.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/s3c2440.c b/drivers/serial/s3c2440.c index 317d239ab74..29cbb0afef8 100644 --- a/drivers/serial/s3c2440.c +++ b/drivers/serial/s3c2440.c @@ -177,5 +177,5 @@ module_exit(s3c2440_serial_exit); MODULE_DESCRIPTION("Samsung S3C2440,S3C2442 SoC Serial port driver"); MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>"); -MODULE_LICENSE("GPLi v2"); +MODULE_LICENSE("GPL v2"); MODULE_ALIAS("platform:s3c2440-uart"); |