[kernel] r7336 - dists/trunk/linux-2.6/debian/patches

[Martin Michlmayr]

Author: tbm
Date: Tue Sep  5 13:06:43 2006
New Revision: 7336

Removed:
   dists/trunk/linux-2.6/debian/patches/mips-bcm1480-inthandler-typo.patch
   dists/trunk/linux-2.6/debian/patches/mips-cobalt-console.patch
   dists/trunk/linux-2.6/debian/patches/mips-ip22-rtcfix.patch
   dists/trunk/linux-2.6/debian/patches/mips-ip22-serial-fix.patch
   dists/trunk/linux-2.6/debian/patches/mips-sb1-inthandler.patch
   dists/trunk/linux-2.6/debian/patches/mips-sb1250-duart.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/mips-sb1-duart-tts.patch
   dists/trunk/linux-2.6/debian/patches/mips-sb1-duart.patch

Log:
remove mips patches that are in 2.6.18


Modified: dists/trunk/linux-2.6/debian/patches/mips-sb1-duart-tts.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/mips-sb1-duart-tts.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/mips-sb1-duart-tts.patch	Tue Sep  5 13:06:43 2006
@@ -2,19 +2,14 @@
 Needed for debian-installer
 Status: the sb1250_duart.c driver needs a completely re-write...
 
-diff --git a/drivers/char/sb1250_duart.c b/drivers/char/sb1250_duart.c
-index 7819acc..57a227c 100644
---- a/drivers/char/sb1250_duart.c
-+++ b/drivers/char/sb1250_duart.c
-@@ -762,8 +762,8 @@ static int __init sb1250_duart_init(void
+--- a/drivers/char/sb1250_duart.c~	2006-09-05 15:04:15.015419723 +0200
++++ b/drivers/char/sb1250_duart.c	2006-09-05 15:04:24.442152073 +0200
+@@ -762,7 +762,7 @@
  		return -ENOMEM;
  
  	sb1250_duart_driver->owner = THIS_MODULE;
 -	sb1250_duart_driver->name = "duart";
--	sb1250_duart_driver->devfs_name = "duart/";
 +	sb1250_duart_driver->name = "ttyS";
-+	sb1250_duart_driver->devfs_name = "tts/";
  	sb1250_duart_driver->major = TTY_MAJOR;
  	sb1250_duart_driver->minor_start = SB1250_DUART_MINOR_BASE;
  	sb1250_duart_driver->type            = TTY_DRIVER_TYPE_SERIAL;
-

Modified: dists/trunk/linux-2.6/debian/patches/mips-sb1-duart.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/mips-sb1-duart.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/mips-sb1-duart.patch	Tue Sep  5 13:06:43 2006
@@ -44,10 +44,9 @@
  obj-$(CONFIG_A2232)		+= ser_a2232.o generic_serial.o
  obj-$(CONFIG_ATARI_DSP56K)	+= dsp56k.o
  obj-$(CONFIG_MOXA_SMARTIO)	+= mxser.o
-diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
---- /dev/null	2006-03-09 16:35:42.215252160 +0000
-+++ mips.git/drivers/char/sb1250_duart.c	2006-03-05 18:51:15.000000000 +0000
-@@ -0,0 +1,911 @@
+--- /dev/null	2006-08-04 20:47:12.000000000 +0200
++++ b/drivers/char/sb1250_duart.c	2006-09-05 15:02:53.718727952 +0200
+@@ -0,0 +1,910 @@
 +/*
 + * Copyright (C) 2000,2001,2002,2003,2004 Broadcom Corporation
 + *
@@ -813,7 +812,6 @@
 +
 +	sb1250_duart_driver->owner = THIS_MODULE;
 +	sb1250_duart_driver->name = "duart";
-+	sb1250_duart_driver->devfs_name = "duart/";
 +	sb1250_duart_driver->major = TTY_MAJOR;
 +	sb1250_duart_driver->minor_start = SB1250_DUART_MINOR_BASE;
 +	sb1250_duart_driver->type            = TTY_DRIVER_TYPE_SERIAL;