From 558748901fdd09a834002b4e9b23abc63b5e0704 Mon Sep 17 00:00:00 2001 From: "Robert P. J. Day" Date: Sat, 20 Oct 2007 00:01:12 +0200 Subject: [PATCH] --- yaml --- r: 71835 b: refs/heads/master c: 23d028f69ab73957c0d40ae3e1a2654c985a95d6 h: refs/heads/master i: 71833: 950ca1fef2616183280527ebf90a1d23a155b169 71831: 5129c8c76da8c0542b672cdb767633ce784c447f v: v3 --- [refs] | 2 +- trunk/Documentation/kernel-parameters.txt | 2 -- trunk/drivers/char/cyclades.c | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index da679627bd7a..194c27aa2d19 100644 --- 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 index fc84490fdb05..2e53e97ad04d 100644 --- 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 index 523a6b4a3697..d1bd0f08a331 100644 --- 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[] = {