Refresh patches with quilt, thanks Gabor !

[openwrt.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 6f2ef7b..8a6d020 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,10 +1,37 @@
-diff -urN linux-2.6.19.2/drivers/serial/Kconfig linux-2.6.19.2-adm5120/drivers/serial/Kconfig
---- linux-2.6.19.2/drivers/serial/Kconfig       2007-01-10 20:10:37.000000000 +0100
-+++ linux-2.6.19.2-adm5120/drivers/serial/Kconfig       2007-01-23 01:13:39.000000000 +0100
-@@ -246,6 +246,22 @@
-
+Index: linux-2.6.21.1/drivers/serial/Makefile
+===================================================================
+--- linux-2.6.21.1.orig/drivers/serial/Makefile
++++ linux-2.6.21.1/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
+ obj-$(CONFIG_SERIAL_8250_AU1X00) += 8250_au1x00.o
++obj-$(CONFIG_SERIAL_ADM5120) += adm5120_uart.o
+ 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
+===================================================================
+--- 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
+ 
++/* ADMtek ADM5120 SoC */
++#define PORT_ADM5120  68
++
+ #ifdef __KERNEL__
+ 
+ #include <linux/compiler.h>
+Index: linux-2.6.21.1/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
+ 
  comment "Non-8250 serial port support"
-
+ 
 +config SERIAL_ADM5120
 +       bool "ADM5120 serial port support"
 +       depends on MIPS_ADM5120
@@ -22,29 +49,5 @@ diff -urN linux-2.6.19.2/drivers/serial/Kconfig linux-2.6.19.2-adm5120/drivers/s
 +         support.
 +
  config SERIAL_AMBA_PL010
-        tristate "ARM AMBA PL010 serial port support"
-        depends on ARM_AMBA && (BROKEN || !ARCH_VERSATILE)
-diff -urN linux-2.6.19.2/drivers/serial/Makefile linux-2.6.19.2-adm5120/drivers/serial/Makefile
---- linux-2.6.19.2/drivers/serial/Makefile     2007-01-10 20:10:37.000000000 +0100
-+++ linux-2.6.19.2-adm5120/drivers/serial/Makefile     2007-01-23 01:21:45.000000000 +0100
-@@ -20,6 +20,7 @@
- obj-$(CONFIG_SERIAL_8250_HUB6) += 8250_hub6.o
- obj-$(CONFIG_SERIAL_8250_MCA) += 8250_mca.o
- obj-$(CONFIG_SERIAL_8250_AU1X00) += 8250_au1x00.o
-+obj-$(CONFIG_SERIAL_ADM5120) += adm5120_uart.o
- obj-$(CONFIG_SERIAL_AMBA_PL010) += amba-pl010.o
- obj-$(CONFIG_SERIAL_AMBA_PL011) += amba-pl011.o
- obj-$(CONFIG_SERIAL_CLPS711X) += clps711x.o
-diff -urN linux-2.6.19.2/include/linux/serial_core.h linux-2.6.19.2-adm5120/include/linux/serial_core.h
---- linux-2.6.19.2/include/linux/serial_core.h 2007-01-10 20:10:37.000000000 +0100
-+++ linux-2.6.19.2-adm5120/include/linux/serial_core.h 2007-01-23 01:13:39.000000000 +0100
-@@ -133,6 +133,9 @@
- #define PORT_S3C2412  73
- 
- 
-+/* ADMtek ADM5120 SoC */
-+#define PORT_ADM5120  68
-+
- #ifdef __KERNEL__
- 
- #include <linux/compiler.h>
+       tristate "ARM AMBA PL010 serial port support"
+       depends on ARM_AMBA && (BROKEN || !ARCH_VERSATILE)