[kernel] r8513 - in dists/trunk/linux-2.6/debian/patches: features/mips series

[Martin Michlmayr]

Author: tbm
Date: Wed Apr 25 15:20:12 2007
New Revision: 8513

Modified:
   dists/trunk/linux-2.6/debian/patches/features/mips/sb1-duart.patch
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
Log:
update patch


Modified: dists/trunk/linux-2.6/debian/patches/features/mips/sb1-duart.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/mips/sb1-duart.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/features/mips/sb1-duart.patch	Wed Apr 25 15:20:12 2007
@@ -15,11 +15,11 @@
  
  #define SERIAL_IO_PORT	0
  #define SERIAL_IO_HUB6	1
---- a/drivers/char/Kconfig	2006-11-19 19:09:01.000000000 +0000
-+++ b/drivers/char/Kconfig	2006-11-19 19:09:41.000000000 +0000
-@@ -371,6 +371,14 @@
- 	  If you have an Alchemy AU1000 processor (MIPS based) and you want
- 	  to use a console on a serial port, say Y.  Otherwise, say N.
+--- a/drivers/char/Kconfig~	2007-04-25 15:13:07.000000000 +0000
++++ b/drivers/char/Kconfig	2007-04-25 15:13:10.000000000 +0000
+@@ -419,6 +419,14 @@
+ 	  Documentation on the Zilog 85C350 serial communications controller
+ 	  is downloadable at <http://www.zilog.com/pdfs/serial/z85c30.pdf>
  
 +config SIBYTE_SB1250_DUART
 +	bool "Support for BCM1xxx onchip DUART"

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Wed Apr 25 15:20:12 2007
@@ -19,8 +19,7 @@
 + bugfix/mips/64bit-tulip.patch
 + bugfix/mips/tulip_dc21143.patch
 + features/mips/qemu-vga.patch
-# Kconfig snippet conflicts with upstream changes
-#+ features/mips/sb1-duart.patch
++ features/mips/sb1-duart.patch
 + features/arm/nslu2-setup-mac.patch
 + features/arm/nslu2-eth-mac.patch
 + features/arm/nas100d-setup-mac.patch