[adm5120] update to 2.6.22-rc6

[openwrt-10.03/.git] / target / linux / adm5120-2.6 / patches / 004-adm5120_uart.patch

diff --git a/target/linux/adm5120-2.6/patches/004-adm5120_uart.patch b/target/linux/adm5120-2.6/patches/004-adm5120_uart.patch
index 8a6d0205e2ec6b2fa715658379af2b83cd3dc2aa..eb78e035749079a61d3c8c231db89780d1a0ed31 100644 (file)
--- a/target/linux/adm5120-2.6/patches/004-adm5120_uart.patch
+++ b/target/linux/adm5120-2.6/patches/004-adm5120_uart.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.21.1/drivers/serial/Makefile
+Index: linux-2.6.22-rc6/drivers/serial/Makefile
 ===================================================================
---- linux-2.6.21.1.orig/drivers/serial/Makefile
-+++ linux-2.6.21.1/drivers/serial/Makefile
+--- linux-2.6.22-rc6.orig/drivers/serial/Makefile
++++ linux-2.6.22-rc6/drivers/serial/Makefile
 @@ -21,6 +21,7 @@ obj-$(CONFIG_SERIAL_8250_EXAR_ST16C554) 
  obj-$(CONFIG_SERIAL_8250_HUB6) += 8250_hub6.o
  obj-$(CONFIG_SERIAL_8250_MCA) += 8250_mca.o
@@ -10,25 +10,25 @@ Index: linux-2.6.21.1/drivers/serial/Makefile
  obj-$(CONFIG_SERIAL_AMBA_PL010) += amba-pl010.o
  obj-$(CONFIG_SERIAL_AMBA_PL011) += amba-pl011.o
  obj-$(CONFIG_SERIAL_CLPS711X) += clps711x.o
-Index: linux-2.6.21.1/include/linux/serial_core.h
+Index: linux-2.6.22-rc6/include/linux/serial_core.h
 ===================================================================
---- linux-2.6.21.1.orig/include/linux/serial_core.h
-+++ linux-2.6.21.1/include/linux/serial_core.h
-@@ -135,6 +135,9 @@
- /* Xilinx uartlite */
- #define PORT_UARTLITE 74
+--- linux-2.6.22-rc6.orig/include/linux/serial_core.h
++++ linux-2.6.22-rc6/include/linux/serial_core.h
+@@ -143,6 +143,9 @@
+ #define PORT_KS8695   76
+ 
  
 +/* ADMtek ADM5120 SoC */
-+#define PORT_ADM5120  68
++#define PORT_ADM5120  77
 +
  #ifdef __KERNEL__
  
  #include <linux/compiler.h>
-Index: linux-2.6.21.1/drivers/serial/Kconfig
+Index: linux-2.6.22-rc6/drivers/serial/Kconfig
 ===================================================================
---- linux-2.6.21.1.orig/drivers/serial/Kconfig
-+++ linux-2.6.21.1/drivers/serial/Kconfig
-@@ -256,6 +256,22 @@ config SERIAL_8250_AU1X00
+--- linux-2.6.22-rc6.orig/drivers/serial/Kconfig
++++ linux-2.6.22-rc6/drivers/serial/Kconfig
+@@ -270,6 +270,22 @@ config SERIAL_8250_RM9K
  
  comment "Non-8250 serial port support"