diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-20 07:45:40 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-20 07:45:40 -0400 |
| commit | 9b5b0c01598f9782690b09ce6c49f4ba116dde44 (patch) | |
| tree | dc8f4f66ed75f0b4843619362e088618e160847c /sound/soc/omap/n810.c | |
| parent | 7154b3e80203ee91f9ba7d0a43d3daa05c49d9e9 (diff) | |
| parent | b08f7a62cafd7998862072a1c353219e3d84bbef (diff) | |
Merge branch 'for-2.6.30' into for-2.6.31
Diffstat (limited to 'sound/soc/omap/n810.c')
| -rw-r--r-- | sound/soc/omap/n810.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c index e54e1c2f5e63..b60b1dfbc435 100644 --- a/sound/soc/omap/n810.c +++ b/sound/soc/omap/n810.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2008 Nokia Corporation | 4 | * Copyright (C) 2008 Nokia Corporation |
| 5 | * | 5 | * |
| 6 | * Contact: Jarkko Nikula <jarkko.nikula@nokia.com> | 6 | * Contact: Jarkko Nikula <jhnikula@gmail.com> |
| 7 | * | 7 | * |
| 8 | * This program is free software; you can redistribute it and/or | 8 | * This program is free software; you can redistribute it and/or |
| 9 | * modify it under the terms of the GNU General Public License | 9 | * modify it under the terms of the GNU General Public License |
| @@ -416,6 +416,6 @@ static void __exit n810_soc_exit(void) | |||
| 416 | module_init(n810_soc_init); | 416 | module_init(n810_soc_init); |
| 417 | module_exit(n810_soc_exit); | 417 | module_exit(n810_soc_exit); |
| 418 | 418 | ||
| 419 | MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@nokia.com>"); | 419 | MODULE_AUTHOR("Jarkko Nikula <jhnikula@gmail.com>"); |
| 420 | MODULE_DESCRIPTION("ALSA SoC Nokia N810"); | 420 | MODULE_DESCRIPTION("ALSA SoC Nokia N810"); |
| 421 | MODULE_LICENSE("GPL"); | 421 | MODULE_LICENSE("GPL"); |