diff options
author | Jonas Gorski <jogo@openwrt.org> | 2012-04-17 12:50:54 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2012-04-17 12:50:54 +0000 |
commit | ee4c47a134723b78162f9f5eedc9f132dd19f6b7 (patch) | |
tree | 34e93dc39c40a016b3bf5539f7de92400e114a9b /target/linux/lantiq/patches-3.2/0031-MIPS-lantiq-convert-falcon-debug-uart-to-clkdev-api.patch | |
parent | cfe30549a16b84e0d7caebd94fd7c2b81261de1a (diff) | |
download | master-31e0f0ae-ee4c47a134723b78162f9f5eedc9f132dd19f6b7.tar.gz master-31e0f0ae-ee4c47a134723b78162f9f5eedc9f132dd19f6b7.tar.bz2 master-31e0f0ae-ee4c47a134723b78162f9f5eedc9f132dd19f6b7.zip |
kernel: update linux 3.2 to 3.2.15
SVN-Revision: 31335
Diffstat (limited to 'target/linux/lantiq/patches-3.2/0031-MIPS-lantiq-convert-falcon-debug-uart-to-clkdev-api.patch')
-rw-r--r-- | target/linux/lantiq/patches-3.2/0031-MIPS-lantiq-convert-falcon-debug-uart-to-clkdev-api.patch | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/target/linux/lantiq/patches-3.2/0031-MIPS-lantiq-convert-falcon-debug-uart-to-clkdev-api.patch b/target/linux/lantiq/patches-3.2/0031-MIPS-lantiq-convert-falcon-debug-uart-to-clkdev-api.patch index a1e61ff5b0..f3a9b2423f 100644 --- a/target/linux/lantiq/patches-3.2/0031-MIPS-lantiq-convert-falcon-debug-uart-to-clkdev-api.patch +++ b/target/linux/lantiq/patches-3.2/0031-MIPS-lantiq-convert-falcon-debug-uart-to-clkdev-api.patch @@ -13,8 +13,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org> drivers/tty/serial/lantiq.c | 7 ++++--- 2 files changed, 5 insertions(+), 6 deletions(-) -diff --git a/arch/mips/lantiq/falcon/prom.c b/arch/mips/lantiq/falcon/prom.c -index f98b389..2a4eea17 100644 --- a/arch/mips/lantiq/falcon/prom.c +++ b/arch/mips/lantiq/falcon/prom.c @@ -43,10 +43,8 @@ ltq_soc_setup(void) @@ -29,8 +27,6 @@ index f98b389..2a4eea17 100644 } void __init -diff --git a/drivers/tty/serial/lantiq.c b/drivers/tty/serial/lantiq.c -index 1542ad6..82956de 100644 --- a/drivers/tty/serial/lantiq.c +++ b/drivers/tty/serial/lantiq.c @@ -117,6 +117,7 @@ static DEFINE_SPINLOCK(ltq_asc_lock); @@ -50,7 +46,7 @@ index 1542ad6..82956de 100644 ltq_w32_mask(ASCCLC_DISS | ASCCLC_RMCMASK, (1 << ASCCLC_RMCOFFSET), port->membase + LTQ_ASC_CLC); -@@ -646,7 +647,7 @@ lqasc_console_setup(struct console *co, char *options) +@@ -646,7 +647,7 @@ lqasc_console_setup(struct console *co, port = <q_port->port; @@ -59,7 +55,7 @@ index 1542ad6..82956de 100644 if (options) uart_parse_options(options, &baud, &parity, &bits, &flow); -@@ -731,7 +732,7 @@ lqasc_probe(struct platform_device *pdev) +@@ -731,7 +732,7 @@ lqasc_probe(struct platform_device *pdev port->irq = tx_irq; /* unused, just to be backward-compatibe */ port->mapbase = mmres->start; @@ -68,6 +64,3 @@ index 1542ad6..82956de 100644 ltq_port->tx_irq = tx_irq; ltq_port->rx_irq = rx_irq; --- -1.7.9.1 - |