diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2012-04-01 07:56:55 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2012-04-01 07:56:55 +0000 |
| commit | d87efd8c3c2acd5d0f96b25514282a84f425419f (patch) | |
| tree | 1d89c8f9fb694414d9ae46d89bddf584f94c9b00 /target/linux/lantiq/patches-3.2/0031-SERIAL-MIPS-lantiq-convert-serial-driver-to-clkdev-a.patch | |
| parent | 1a395bd290a84223da5d915b7e38b6ca23d14c09 (diff) | |
| download | upstream-d87efd8c3c2acd5d0f96b25514282a84f425419f.tar.gz upstream-d87efd8c3c2acd5d0f96b25514282a84f425419f.tar.bz2 upstream-d87efd8c3c2acd5d0f96b25514282a84f425419f.zip | |
kernel: update linux 3.2 to 3.2.13 and refresh patches
Also remove a duplicate patch from lantiq (already in generic).
SVN-Revision: 31158
Diffstat (limited to 'target/linux/lantiq/patches-3.2/0031-SERIAL-MIPS-lantiq-convert-serial-driver-to-clkdev-a.patch')
| -rw-r--r-- | target/linux/lantiq/patches-3.2/0031-SERIAL-MIPS-lantiq-convert-serial-driver-to-clkdev-a.patch | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/lantiq/patches-3.2/0031-SERIAL-MIPS-lantiq-convert-serial-driver-to-clkdev-a.patch b/target/linux/lantiq/patches-3.2/0031-SERIAL-MIPS-lantiq-convert-serial-driver-to-clkdev-a.patch index dc651aa9e0..e282b0ba93 100644 --- a/target/linux/lantiq/patches-3.2/0031-SERIAL-MIPS-lantiq-convert-serial-driver-to-clkdev-a.patch +++ b/target/linux/lantiq/patches-3.2/0031-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.7.1 - |