Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b5b0c01 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.30' into for-2.6.31

parents 7154b3e8 b08f7a62

sound/soc/omap/n810.c

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * Copyright (C) 2008 Nokia Corporation

 *

 * Contact: Jarkko Nikula <jarkko.nikula@nokia.com>

 * Contact: Jarkko Nikula <jhnikula@gmail.com>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License
@@ -416,6 +416,6 @@ static void __exit n810_soc_exit(void) 
module_init(n810_soc_init);

module_exit(n810_soc_exit);



MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@nokia.com>");

MODULE_AUTHOR("Jarkko Nikula <jhnikula@gmail.com>");

MODULE_DESCRIPTION("ALSA SoC Nokia N810");

MODULE_LICENSE("GPL");

sound/soc/omap/omap-mcbsp.c

+3 −2
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 
 *

 * Copyright (C) 2008 Nokia Corporation

 *

 * Contact: Jarkko Nikula <jarkko.nikula@nokia.com>

 * Contact: Jarkko Nikula <jhnikula@gmail.com>

 *          Peter Ujfalusi <peter.ujfalusi@nokia.com>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License
@@ -546,6 +547,6 @@ static void __exit snd_omap_mcbsp_exit(void) 
}

module_exit(snd_omap_mcbsp_exit);



MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@nokia.com>");

MODULE_AUTHOR("Jarkko Nikula <jhnikula@gmail.com>");

MODULE_DESCRIPTION("OMAP I2S SoC Interface");

MODULE_LICENSE("GPL");

sound/soc/omap/omap-mcbsp.h

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 
 *

 * Copyright (C) 2008 Nokia Corporation

 *

 * Contact: Jarkko Nikula <jarkko.nikula@nokia.com>

 * Contact: Jarkko Nikula <jhnikula@gmail.com>

 *          Peter Ujfalusi <peter.ujfalusi@nokia.com>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

sound/soc/omap/omap-pcm.c

+3 −2
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 
 *

 * Copyright (C) 2008 Nokia Corporation

 *

 * Contact: Jarkko Nikula <jarkko.nikula@nokia.com>

 * Contact: Jarkko Nikula <jhnikula@gmail.com>

 *          Peter Ujfalusi <peter.ujfalusi@nokia.com>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License
@@ -367,6 +368,6 @@ static void __exit omap_soc_platform_exit(void) 
}

module_exit(omap_soc_platform_exit);



MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@nokia.com>");

MODULE_AUTHOR("Jarkko Nikula <jhnikula@gmail.com>");

MODULE_DESCRIPTION("OMAP PCM DMA module");

MODULE_LICENSE("GPL");

sound/soc/omap/omap-pcm.h

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 
 *

 * Copyright (C) 2008 Nokia Corporation

 *

 * Contact: Jarkko Nikula <jarkko.nikula@nokia.com>

 * Contact: Jarkko Nikula <jhnikula@gmail.com>

 *          Peter Ujfalusi <peter.ujfalusi@nokia.com>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License