From a3cf84a40b0b3218debe7eab83038ef986ba5c81 Mon Sep 17 00:00:00 2001 From: "Robert P. J. Day" Date: Sun, 3 Feb 2008 15:18:45 +0200 Subject: [PATCH] --- yaml --- r: 82741 b: refs/heads/master c: 2d27a96614c961b069d1a8abdeaf2750a3941bd1 h: refs/heads/master i: 82739: 017b9a2fd8159516e134c9d7245fc98544168794 v: v3 --- [refs] | 2 +- trunk/Documentation/kernel-parameters.txt | 2 +- trunk/Documentation/networking/decnet.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3184400ea2ca..6aea1da5449a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e1b8513d21845fbeb93d6d2c4973db874385059f +refs/heads/master: 2d27a96614c961b069d1a8abdeaf2750a3941bd1 diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index cf3868956f1e..072cf6d4ec8d 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -549,7 +549,7 @@ and is between 256 and 4096 characters. It is defined in the file 1 will print _a lot_ more information - normally only useful to kernel developers. - decnet= [HW,NET] + decnet.addr= [HW,NET] Format: [,] See also Documentation/networking/decnet.txt. diff --git a/trunk/Documentation/networking/decnet.txt b/trunk/Documentation/networking/decnet.txt index badb7480ea62..d8968958d839 100644 --- a/trunk/Documentation/networking/decnet.txt +++ b/trunk/Documentation/networking/decnet.txt @@ -60,7 +60,7 @@ operation of the local communications in any other way though. The kernel command line takes options looking like the following: - decnet=1,2 + decnet.addr=1,2 the two numbers are the node address 1,2 = 1.2 For 2.2.xx kernels and early 2.3.xx kernels, you must use a comma when specifying the