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

Commit ec62dbd7 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.36' of... 

Merge branch 'for-2.6.36' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into for-2.6.37

Trivial overlap with the removal of the local revision variable.

Conflicts:
	sound/soc/codecs/wm8994.c
parents 6bfb6aa9 a532f97c

MAINTAINERS

+4 −3
Original line number Diff line number Diff line
@@ -6303,8 +6303,9 @@ S: Supported 
F:	drivers/input/touchscreen/*wm97*

F:	include/linux/wm97xx.h



WOLFSON MICROELECTRONICS PMIC DRIVERS

WOLFSON MICROELECTRONICS DRIVERS

M:	Mark Brown <broonie@opensource.wolfsonmicro.com>

M:	Ian Lartey <ian@opensource.wolfsonmicro.com>

T:	git git://opensource.wolfsonmicro.com/linux-2.6-audioplus

W:	http://opensource.wolfsonmicro.com/node/8

S:	Supported
@@ -6319,8 +6320,8 @@ F: drivers/watchdog/wm83*_wdt.c 
F:	include/linux/mfd/wm831x/

F:	include/linux/mfd/wm8350/

F:	include/linux/mfd/wm8400*

F:	sound/soc/codecs/wm8350.*

F:	sound/soc/codecs/wm8400.*

F:	include/sound/wm????.h

F:	sound/soc/codecs/wm*



X.25 NETWORK LAYER

M:	Andrew Hendry <andrew.hendry@gmail.com>

sound/soc/blackfin/Kconfig

+6 −1
Original line number Diff line number Diff line
@@ -105,13 +105,18 @@ config SND_BF5XX_RESET_GPIO_NUM 
	  Set the correct GPIO for RESET the sound chip.



config SND_BF5XX_SOC_AD1980

	tristate "SoC AD1980/1 Audio support for BF5xx"

	tristate "SoC AD1980/1 Audio support for BF5xx (Obsolete)"

	depends on SND_BF5XX_AC97

	select SND_BF5XX_SOC_AC97

	select SND_SOC_AD1980

	help

	  Say Y if you want to add support for SoC audio on BF5xx STAMP/EZKIT.



	  Warning:

	  Because Analog Devices Inc. discontinued the ad1980 sound chip since

	  Sep. 2009, this ad1980 driver is not maintained, tested and supported

	  by ADI now.



config SND_BF5XX_SOC_SPORT

	tristate

sound/soc/blackfin/bf5xx-ad1980.c

+9 −1
Original line number Diff line number Diff line
@@ -26,6 +26,14 @@ 
 * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 */



/*

 * WARNING:

 *

 * Because Analog Devices Inc. discontinued the ad1980 sound chip since

 * Sep. 2009, this ad1980 driver is not maintained, tested and supported

 * by ADI now.

 */



#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/device.h>
@@ -104,5 +112,5 @@ module_exit(bf5xx_board_exit); 


/* Module information */

MODULE_AUTHOR("Cliff Cai");

MODULE_DESCRIPTION("ALSA SoC AD1980/1 BF5xx board");

MODULE_DESCRIPTION("ALSA SoC AD1980/1 BF5xx board (Obsolete)");

MODULE_LICENSE("GPL");

sound/soc/codecs/ad1980.c

+9 −1
Original line number Diff line number Diff line
@@ -11,6 +11,14 @@ 
 *  option) any later version.

 */



/*

 * WARNING:

 *

 * Because Analog Devices Inc. discontinued the ad1980 sound chip since

 * Sep. 2009, this ad1980 driver is not maintained, tested and supported

 * by ADI now.

 */



#include <linux/init.h>

#include <linux/slab.h>

#include <linux/module.h>
@@ -283,6 +291,6 @@ static void __exit ad1980_exit(void) 
}

module_exit(ad1980_exit);



MODULE_DESCRIPTION("ASoC ad1980 driver");

MODULE_DESCRIPTION("ASoC ad1980 driver (Obsolete)");

MODULE_AUTHOR("Roy Huang, Cliff Cai");

MODULE_LICENSE("GPL");

sound/soc/codecs/ad1980.h

+6 −0
Original line number Diff line number Diff line 
/*

 * ad1980.h  --  ad1980 Soc Audio driver

 *

 * WARNING:

 *

 * Because Analog Devices Inc. discontinued the ad1980 sound chip since

 * Sep. 2009, this ad1980 driver is not maintained, tested and supported

 * by ADI now.

 */



#ifndef _AD1980_H