[kernel] r7853 - dists/trunk/linux-2.6/debian/patches/features/mips

[Martin Michlmayr]

Author: tbm
Date: Sun Nov 19 20:12:47 2006
New Revision: 7853

Modified:
   dists/trunk/linux-2.6/debian/patches/features/mips/sb1-duart.patch
Log:
make it apply


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	Sun Nov 19 20:12:47 2006
@@ -15,9 +15,9 @@
  
  #define SERIAL_IO_PORT	0
  #define SERIAL_IO_HUB6	1
---- a/drivers/char/Kconfig
-+++ b/drivers/char/Kconfig
-@@ -353,6 +353,14 @@ config AU1000_SERIAL_CONSOLE
+--- 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.
  
@@ -29,9 +29,9 @@
 +	bool "Console on BCM1xxx DUART"
 +	depends on SIBYTE_SB1250_DUART
 +
- config QTRONIX_KEYBOARD
- 	bool "Enable Qtronix 990P Keyboard Support"
- 	depends on IT8712
+ config A2232
+ 	tristate "Commodore A2232 serial support (EXPERIMENTAL)"
+ 	depends on EXPERIMENTAL && ZORRO && BROKEN_ON_SMP
 diff --git a/drivers/char/Makefile b/drivers/char/Makefile
 index 503dd90..2db5532 100644
 --- a/drivers/char/Makefile