diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2007-06-28 16:08:28 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2007-06-28 16:08:28 +0000 |
| commit | 031f500ae4cfcd16e8bc6790d190cf6873134a2b (patch) | |
| tree | b9fb2809033747d4da7a8f9450be041e721df243 /target/linux/adm5120-2.6/patches/004-adm5120_uart.patch | |
| parent | 01b4fd853ad81d806eb6b63fc90dcdbabaabc10b (diff) | |
| download | upstream-031f500ae4cfcd16e8bc6790d190cf6873134a2b.tar.gz upstream-031f500ae4cfcd16e8bc6790d190cf6873134a2b.tar.bz2 upstream-031f500ae4cfcd16e8bc6790d190cf6873134a2b.zip | |
update to 2.6.22-rc6
SVN-Revision: 7758
Diffstat (limited to 'target/linux/adm5120-2.6/patches/004-adm5120_uart.patch')
| -rw-r--r-- | target/linux/adm5120-2.6/patches/004-adm5120_uart.patch | 28 |
1 files changed, 14 insertions, 14 deletions
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 8a6d0205e2..eb78e03574 100644 --- 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" |