From 950ca1fef2616183280527ebf90a1d23a155b169 Mon Sep 17 00:00:00 2001 From: "Robert P. J. Day" Date: Fri, 19 Oct 2007 23:33:35 +0200 Subject: [PATCH] --- yaml --- r: 71833 b: refs/heads/master c: ac0bf14df705f5fa93a06a62e51e632b4394ee41 h: refs/heads/master i: 71831: 5129c8c76da8c0542b672cdb767633ce784c447f v: v3 --- [refs] | 2 +- trunk/Documentation/kernel-parameters.txt | 3 --- trunk/Documentation/m68k/kernel-options.txt | 5 +---- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 2f7d11edf22e..04178de4cf69 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 634fe2fdbf2ea7066fbb13373cf3d0e02d47fbae +refs/heads/master: ac0bf14df705f5fa93a06a62e51e632b4394ee41 diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index c0826448a6fc..59b1ab5d30df 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -1133,9 +1133,6 @@ and is between 256 and 4096 characters. It is defined in the file noapic [SMP,APIC] Tells the kernel to not make use of any IOAPICs that may be present in the system. - noasync [HW,M68K] Disables async and sync negotiation for - all devices. - nobats [PPC] Do not use BATs for mapping kernel lowmem on "Classic" PPC cores. diff --git a/trunk/Documentation/m68k/kernel-options.txt b/trunk/Documentation/m68k/kernel-options.txt index 8a523f6af48a..248589e8bcf5 100644 --- a/trunk/Documentation/m68k/kernel-options.txt +++ b/trunk/Documentation/m68k/kernel-options.txt @@ -890,10 +890,7 @@ Syntax: nosync:0 5.5.2) noasync -------------- -Syntax: noasync:0 - - Disables async and sync negotiation for all devices. Any value - after the colon is acceptable (and has the same effect). +[OBSOLETE, REMOVED] 5.5.3) nodisconnect -------------------