aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/at91/patches-2.6.25/009-fdl-uartinit.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-07-26 10:53:23 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-07-26 10:53:23 +0000
commit6d2ba97481de5894a796a384a85126053bfcf25f (patch)
tree4a23a5ed448fd40c6f12dbf60c409f6cf6d860ba /target/linux/at91/patches-2.6.25/009-fdl-uartinit.patch
parenta0a21d42684a78d27683115297ef16457ca64d12 (diff)
downloadupstream-6d2ba97481de5894a796a384a85126053bfcf25f.tar.gz
upstream-6d2ba97481de5894a796a384a85126053bfcf25f.tar.bz2
upstream-6d2ba97481de5894a796a384a85126053bfcf25f.zip
[kernel] update to 2.6.25.12
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11933 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/at91/patches-2.6.25/009-fdl-uartinit.patch')
-rw-r--r--target/linux/at91/patches-2.6.25/009-fdl-uartinit.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/at91/patches-2.6.25/009-fdl-uartinit.patch b/target/linux/at91/patches-2.6.25/009-fdl-uartinit.patch
index 64bb3ec5d6..45d6783bb4 100644
--- a/target/linux/at91/patches-2.6.25/009-fdl-uartinit.patch
+++ b/target/linux/at91/patches-2.6.25/009-fdl-uartinit.patch
@@ -1,6 +1,6 @@
---- linux-2.6.25.10.old/arch/arm/mach-at91/at91rm9200_devices.c 2008-07-04 15:04:13.000000000 +0200
-+++ linux-2.6.25.10/arch/arm/mach-at91/at91rm9200_devices.c 2008-07-04 15:11:44.000000000 +0200
-@@ -981,7 +981,15 @@
+--- a/arch/arm/mach-at91/at91rm9200_devices.c
++++ b/arch/arm/mach-at91/at91rm9200_devices.c
+@@ -1001,7 +1001,15 @@
* We need to drive the pin manually. Default is off (RTS is active low).
*/
at91_set_gpio_output(AT91_PIN_PA21, 1);
@@ -17,7 +17,7 @@
}
static struct resource uart1_resources[] = {
-@@ -1119,6 +1127,14 @@
+@@ -1139,6 +1147,14 @@
at91_set_B_periph(AT91_PIN_PB1, 0); /* CTS3 */
if (pins & ATMEL_UART_RTS)
at91_set_B_periph(AT91_PIN_PB0, 0); /* RTS3 */