diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2008-10-15 19:30:21 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2008-10-15 19:30:21 +0000 |
commit | ab47d507d2ff2b0846433bc3c77de03c995258f6 (patch) | |
tree | eaa83c336bf1e8a4942376277bb17dab04a0630e /target/linux/ixp4xx/patches-2.6.27/191-cambria_optional_uart.patch | |
parent | 2154d8cde2088958a3c5f221bac76dfb8c9da600 (diff) | |
download | upstream-ab47d507d2ff2b0846433bc3c77de03c995258f6.tar.gz upstream-ab47d507d2ff2b0846433bc3c77de03c995258f6.tar.bz2 upstream-ab47d507d2ff2b0846433bc3c77de03c995258f6.zip |
[kernel] refresh patches against 2.6.27 final
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12987 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.27/191-cambria_optional_uart.patch')
-rw-r--r-- | target/linux/ixp4xx/patches-2.6.27/191-cambria_optional_uart.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.27/191-cambria_optional_uart.patch b/target/linux/ixp4xx/patches-2.6.27/191-cambria_optional_uart.patch index 9688767c86..5305417ab9 100644 --- a/target/linux/ixp4xx/patches-2.6.27/191-cambria_optional_uart.patch +++ b/target/linux/ixp4xx/patches-2.6.27/191-cambria_optional_uart.patch @@ -8,7 +8,7 @@ struct cambria_board_info { unsigned char *model; -@@ -105,6 +106,43 @@ +@@ -105,6 +106,43 @@ static struct platform_device cambria_ua .resource = &cambria_uart_resource, }; @@ -52,7 +52,7 @@ static struct resource cambria_pata_resources[] = { { .flags = IORESOURCE_MEM -@@ -287,6 +325,19 @@ +@@ -287,6 +325,19 @@ static void __init cambria_gw23xx_setup( #ifdef CONFIG_SENSORS_EEPROM static void __init cambria_gw2350_setup(void) { @@ -72,7 +72,7 @@ platform_device_register(&cambria_npec_device); platform_device_register(&cambria_npea_device); -@@ -294,10 +345,26 @@ +@@ -294,10 +345,26 @@ static void __init cambria_gw2350_setup( platform_device_register(&cambria_usb1_device); platform_device_register(&cambria_gpio_leds_device); |