aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-3.2/0030-SERIAL-MIPS-lantiq-convert-serial-driver-to-clkdev-a.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2012-04-17 12:50:54 +0000
committerJonas Gorski <jogo@openwrt.org>2012-04-17 12:50:54 +0000
commitee4c47a134723b78162f9f5eedc9f132dd19f6b7 (patch)
tree34e93dc39c40a016b3bf5539f7de92400e114a9b /target/linux/lantiq/patches-3.2/0030-SERIAL-MIPS-lantiq-convert-serial-driver-to-clkdev-a.patch
parentcfe30549a16b84e0d7caebd94fd7c2b81261de1a (diff)
downloadupstream-ee4c47a134723b78162f9f5eedc9f132dd19f6b7.tar.gz
upstream-ee4c47a134723b78162f9f5eedc9f132dd19f6b7.tar.bz2
upstream-ee4c47a134723b78162f9f5eedc9f132dd19f6b7.zip
kernel: update linux 3.2 to 3.2.15
SVN-Revision: 31335
Diffstat (limited to 'target/linux/lantiq/patches-3.2/0030-SERIAL-MIPS-lantiq-convert-serial-driver-to-clkdev-a.patch')
-rw-r--r--target/linux/lantiq/patches-3.2/0030-SERIAL-MIPS-lantiq-convert-serial-driver-to-clkdev-a.patch9
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/lantiq/patches-3.2/0030-SERIAL-MIPS-lantiq-convert-serial-driver-to-clkdev-a.patch b/target/linux/lantiq/patches-3.2/0030-SERIAL-MIPS-lantiq-convert-serial-driver-to-clkdev-a.patch
index 8d737d0bbb..ccaf3b2810 100644
--- a/target/linux/lantiq/patches-3.2/0030-SERIAL-MIPS-lantiq-convert-serial-driver-to-clkdev-a.patch
+++ b/target/linux/lantiq/patches-3.2/0030-SERIAL-MIPS-lantiq-convert-serial-driver-to-clkdev-a.patch
@@ -12,11 +12,9 @@ Cc: linux-serial@vger.kernel.org
drivers/tty/serial/lantiq.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
-diff --git a/drivers/tty/serial/lantiq.c b/drivers/tty/serial/lantiq.c
-index 5d25828..1542ad6 100644
--- a/drivers/tty/serial/lantiq.c
+++ b/drivers/tty/serial/lantiq.c
-@@ -540,6 +540,10 @@ lqasc_request_port(struct uart_port *port)
+@@ -540,6 +540,10 @@ lqasc_request_port(struct uart_port *por
if (ltq_gpio_request(&pdev->dev, MUXC_SIF_TX_PIN,
3, 1, "asc1-tx"))
return -EBUSY;
@@ -27,7 +25,7 @@ index 5d25828..1542ad6 100644
}
return 0;
}
-@@ -698,7 +702,7 @@ lqasc_probe(struct platform_device *pdev)
+@@ -698,7 +702,7 @@ lqasc_probe(struct platform_device *pdev
if (lqasc_port[pdev->id] != NULL)
return -EBUSY;
@@ -36,6 +34,3 @@ index 5d25828..1542ad6 100644
if (IS_ERR(clk)) {
pr_err("failed to get fpi clk\n");
return -ENOENT;
---
-1.7.9.1
-