From: Marcelo Tosatti <marcelo.tosatti@cyclades.com>

- cleanups for cyclades Kconfig entry	(Adrian Bunk/me)
- janitors project: remove dead function	(Don Koch)


---

 25-akpm/drivers/char/Kconfig    |    8 +++-----
 25-akpm/drivers/char/cyclades.c |   10 ----------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff -puN drivers/char/cyclades.c~cyclades-cleanups drivers/char/cyclades.c
--- 25/drivers/char/cyclades.c~cyclades-cleanups	Mon May  3 16:30:54 2004
+++ 25-akpm/drivers/char/cyclades.c	Mon May  3 16:30:54 2004
@@ -681,16 +681,6 @@ static char rcsid[] =
 static void cy_throttle (struct tty_struct *tty);
 static void cy_send_xchar (struct tty_struct *tty, char ch);
 
-static unsigned long 
-cy_get_user(unsigned long *addr)
-{
-	unsigned long result = 0;
-	int error = get_user (result, addr);
-	if (error)
-		printk ("cyclades: cy_get_user: error == %d\n", error);
-	return result;
-}
-
 #ifndef MIN
 #define MIN(a,b)        ((a) < (b) ? (a) : (b))
 #endif
diff -puN drivers/char/Kconfig~cyclades-cleanups drivers/char/Kconfig
--- 25/drivers/char/Kconfig~cyclades-cleanups	Mon May  3 16:30:54 2004
+++ 25-akpm/drivers/char/Kconfig	Mon May  3 16:30:54 2004
@@ -112,15 +112,13 @@ config CYCLADES
 	tristate "Cyclades async mux support"
 	depends on SERIAL_NONSTANDARD
 	---help---
-	  This is a driver for a card that gives you many serial ports. You
-	  would need something like this to connect more than two modems to
+	  This driver supports Cyclades Z and Y multiserial boards.
+	  You would need something like this to connect more than two modems to
 	  your Linux box, for instance in order to become a dial-in server.
+
 	  For information about the Cyclades-Z card, read
 	  <file:drivers/char/README.cycladesZ>.
 
-	  As of 1.3.9x kernels, this driver's minor numbers start at 0 instead
-	  of 32.
-
 	  To compile this driver as a module, choose M here: the
 	  module will be called cyclades.
 

_