aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/au1000/patches-3.18/006-codec.patch
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2016-09-15 21:16:34 +0200
committerStijn Tintel <stijn@linux-ipv6.be>2016-10-24 20:25:14 +0300
commit75e63c249411773613f3f201bea9245623d9f57a (patch)
treedfa1b1919a901a291d53cbd91a683153279287ea /target/linux/au1000/patches-3.18/006-codec.patch
parent2fc3680dd066419576cb0129d0c1bd7618b90f1a (diff)
downloadupstream-75e63c249411773613f3f201bea9245623d9f57a.tar.gz
upstream-75e63c249411773613f3f201bea9245623d9f57a.tar.bz2
upstream-75e63c249411773613f3f201bea9245623d9f57a.zip
kernel: update kernel 3.18 to version 3.18.43
Refresh patches for all targets supporting 3.18 and not marked broken. Compile-tested on all targets using 3.18 and not marked broken. Changes to generic/610-netfilter_match_bypass_default_checks.patch based on 84d489f64f3b382d5544e342f66d8806e94e85d3. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/au1000/patches-3.18/006-codec.patch')
-rw-r--r--target/linux/au1000/patches-3.18/006-codec.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/au1000/patches-3.18/006-codec.patch b/target/linux/au1000/patches-3.18/006-codec.patch
index 45537c63a8..d80cf56ac9 100644
--- a/target/linux/au1000/patches-3.18/006-codec.patch
+++ b/target/linux/au1000/patches-3.18/006-codec.patch
@@ -1,17 +1,17 @@
--- a/arch/mips/alchemy/devboards/db1300.c
+++ b/arch/mips/alchemy/devboards/db1300.c
@@ -712,6 +712,7 @@ static struct platform_device db1300_lcd
-
+
/**********************************************************************/
-
+
+#ifdef CONFIG_TOUCHSCREEN_WM97XX
static void db1300_wm97xx_irqen(struct wm97xx *wm, int enable)
{
- if (enable)
+ if (enable)
@@ -744,6 +745,15 @@ static int db1300_wm97xx_probe(struct pl
- return wm97xx_register_mach_ops(wm, &db1300_wm97xx_ops);
+ return wm97xx_register_mach_ops(wm, &db1300_wm97xx_ops);
}
-
+
+#else
+
+static int db1300_wm97xx_probe(struct platform_device *pdev)
@@ -22,5 +22,5 @@
+#endif
+
static struct platform_driver db1300_wm97xx_driver = {
- .driver.name = "wm97xx-touch",
- .driver.owner = THIS_MODULE,
+ .driver.name = "wm97xx-touch",
+ .driver.owner = THIS_MODULE,