diff options
author | Jonas Gorski <jogo@openwrt.org> | 2012-04-09 14:48:51 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2012-04-09 14:48:51 +0000 |
commit | fe073513d57e5790e0b3e1c4f084139e7ef34b9c (patch) | |
tree | 682a8e4f91e0cc08dc49cbd550cc2cc7618afdb9 /target/linux/xburst/patches-3.2/0018-ASoC-jz4740-Convert-qi_lb60-to-use-snd_soc_register_.patch | |
parent | a0bbe7df3b49210a8e8fffc591e2008496a946b4 (diff) | |
download | upstream-fe073513d57e5790e0b3e1c4f084139e7ef34b9c.tar.gz upstream-fe073513d57e5790e0b3e1c4f084139e7ef34b9c.tar.bz2 upstream-fe073513d57e5790e0b3e1c4f084139e7ef34b9c.zip |
kernel: update linux 3.2 to 3.2.14
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31222 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/xburst/patches-3.2/0018-ASoC-jz4740-Convert-qi_lb60-to-use-snd_soc_register_.patch')
-rw-r--r-- | target/linux/xburst/patches-3.2/0018-ASoC-jz4740-Convert-qi_lb60-to-use-snd_soc_register_.patch | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/target/linux/xburst/patches-3.2/0018-ASoC-jz4740-Convert-qi_lb60-to-use-snd_soc_register_.patch b/target/linux/xburst/patches-3.2/0018-ASoC-jz4740-Convert-qi_lb60-to-use-snd_soc_register_.patch index bb2317f113..52962ad836 100644 --- a/target/linux/xburst/patches-3.2/0018-ASoC-jz4740-Convert-qi_lb60-to-use-snd_soc_register_.patch +++ b/target/linux/xburst/patches-3.2/0018-ASoC-jz4740-Convert-qi_lb60-to-use-snd_soc_register_.patch @@ -12,11 +12,9 @@ Signed-off-by: Axel Lin <axel.lin@gmail.com> sound/soc/jz4740/qi_lb60.c | 56 +++++++++++++++++-------------------- 2 files changed, 32 insertions(+), 30 deletions(-) -diff --git a/arch/mips/jz4740/board-qi_lb60.c b/arch/mips/jz4740/board-qi_lb60.c -index f2d94c1..be14dfb 100644 --- a/arch/mips/jz4740/board-qi_lb60.c +++ b/arch/mips/jz4740/board-qi_lb60.c -@@ -418,6 +418,11 @@ static struct platform_device qi_lb60_charger_device = { +@@ -418,6 +418,11 @@ static struct platform_device qi_lb60_ch }, }; @@ -28,7 +26,7 @@ index f2d94c1..be14dfb 100644 static struct platform_device *jz_platform_devices[] __initdata = { &jz4740_udc_device, -@@ -434,6 +439,7 @@ static struct platform_device *jz_platform_devices[] __initdata = { +@@ -434,6 +439,7 @@ static struct platform_device *jz_platfo &qi_lb60_gpio_keys, &qi_lb60_pwm_beeper, &qi_lb60_charger_device, @@ -36,8 +34,6 @@ index f2d94c1..be14dfb 100644 }; static void __init board_gpio_setup(void) -diff --git a/sound/soc/jz4740/qi_lb60.c b/sound/soc/jz4740/qi_lb60.c -index c5fc339..67ddbdd 100644 --- a/sound/soc/jz4740/qi_lb60.c +++ b/sound/soc/jz4740/qi_lb60.c @@ -90,56 +90,52 @@ static struct snd_soc_card qi_lb60 = { @@ -123,6 +119,3 @@ index c5fc339..67ddbdd 100644 MODULE_DESCRIPTION("ALSA SoC QI LB60 Audio support"); MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:qi-lb60-audio"); --- -1.7.5.4 - |