---

yaml --- r: 71835 b: refs/heads/master c: 23d028f h: refs/heads/master i: 71833: 950ca1f 71831: 5129c8c v: v3
git-mirror · Oct 19, 2007 · 5587489 · 5587489
1 parent d9667cc
commit 5587489
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02a72fd6757c955ea8fe81e6ec3ab07a2a9e6ba5
+refs/heads/master: 23d028f69ab73957c0d40ae3e1a2654c985a95d6
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
@@ -507,8 +507,6 @@ and is between 256 and 4096 characters. It is defined in the file
 	cs89x0_media=	[HW,NET]
 			Format: { rj45 | aui | bnc }
 
-	cyclades=	[HW,SERIAL] Cyclades multi-serial port adapter.
-
 	dasd=		[HW,NET]
 			See header of drivers/s390/block/dasd_devmap.c.
 

diff --git a/trunk/drivers/char/cyclades.c b/trunk/drivers/char/cyclades.c
@@ -727,8 +727,6 @@ static struct tty_driver *cy_serial_driver;
    driver to probe addresses at a different address, add it to
    this table.  If the driver is probing some other board and
    causing problems, remove the offending address from this table.
-   The cy_setup function extracts additional addresses from the
-   boot options line.  The form is "cyclades=address,address..."
 */
 
 static unsigned int cy_isa_addresses[] = {