From patchwork Sun May 12 15:23:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 16872 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ye0-f197.google.com (mail-ye0-f197.google.com [209.85.213.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9162520DF3 for ; Sun, 12 May 2013 15:24:29 +0000 (UTC) Received: by mail-ye0-f197.google.com with SMTP id q11sf6178199yen.4 for ; Sun, 12 May 2013 08:23:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=B25JoOPE1AJfdwvxQvsUaqW1UIGzXe4Z1c/m0GtXn78=; b=CUDPnDh6BefEndMKwgMrT/5MIya/4TBHIk9X1AYl9s2WaT/oF0eJClmP4jAjIZFyPL z73zKm8SRQHx1iIi6Rxiza5X8vhcuB4rStixyF3dVlEwMcAibP9Cg/ADo4QOZvRxL95K 5uBIQugVdvNUCgvu+gpsDpC80CdMSUMJpWabNY7aodGZb7jE1OV0ru8+91AF0iAqGWMi r6Zx5y4gO3BvZK+TJph+FWW7xv9eMzBf8icME2EpE0iB2pzEuAsIqF8vq4eRGJ3JHTtm WQV+kiWwvtVGs6BK3bMCx1r8QlXQ95P4BZbg26L0QvJ5oaSJIJ5GgFXshwFoQKU26yJF ijeA== X-Received: by 10.224.36.66 with SMTP id s2mr16769248qad.6.1368372238981; Sun, 12 May 2013 08:23:58 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.96.234 with SMTP id dv10ls2684082qeb.87.gmail; Sun, 12 May 2013 08:23:58 -0700 (PDT) X-Received: by 10.58.155.74 with SMTP id vu10mr16325918veb.27.1368372238693; Sun, 12 May 2013 08:23:58 -0700 (PDT) Received: from mail-ve0-x235.google.com (mail-ve0-x235.google.com [2607:f8b0:400c:c01::235]) by mx.google.com with ESMTPS id s1si6244817vcc.90.2013.05.12.08.23.58 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 12 May 2013 08:23:58 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::235 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c01::235; Received: by mail-ve0-f181.google.com with SMTP id d10so5050009vea.40 for ; Sun, 12 May 2013 08:23:58 -0700 (PDT) X-Received: by 10.220.89.198 with SMTP id f6mr16470298vcm.45.1368372238565; Sun, 12 May 2013 08:23:58 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.217.15 with SMTP id hk15csp125620vcb; Sun, 12 May 2013 08:23:57 -0700 (PDT) X-Received: by 10.152.88.40 with SMTP id bd8mr11519028lab.9.1368372236926; Sun, 12 May 2013 08:23:56 -0700 (PDT) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com [209.85.217.179]) by mx.google.com with ESMTPS id o6si3435198lbo.288.2013.05.12.08.23.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 12 May 2013 08:23:56 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.217.179 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=209.85.217.179; Received: by mail-lb0-f179.google.com with SMTP id d10so5630896lbj.38 for ; Sun, 12 May 2013 08:23:55 -0700 (PDT) X-Received: by 10.112.149.35 with SMTP id tx3mr11190094lbb.95.1368372235402; Sun, 12 May 2013 08:23:55 -0700 (PDT) Received: from localhost.localdomain (c83-249-208-225.bredband.comhem.se. [83.249.208.225]) by mx.google.com with ESMTPSA id t17sm3940449lbd.11.2013.05.12.08.23.52 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 12 May 2013 08:23:54 -0700 (PDT) From: Linus Walleij To: linux-kernel@vger.kernel.org, Jens Axboe Cc: Linus Walleij , Paul Gortmaker Subject: [PATCH] block: remove refs to XD disks from documentation Date: Sun, 12 May 2013 17:23:42 +0200 Message-Id: <1368372222-17569-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.1.4 X-Gm-Message-State: ALoCoQkSBtqPfY5fgR5CIFqUDpSaWBxHNiWOZtYiZL+YB/rYtpDQWovph7bV6F+1xARomi35IeHD X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::235 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Commit d1a6f4f19728d6e90480e53601a90fc9f6a348ad "block: delete super ancient PC-XT driver for 1980's hardware" deleted the XD disk driver, but there are still a few references to it in the documentation directory. Delete the remnants and thus also free up the major block device 13 for reuse. Cc: Paul Gortmaker Cc: Jens Axboe Signed-off-by: Linus Walleij --- Documentation/devices.txt | 7 +------ Documentation/kernel-parameters.txt | 3 --- Documentation/m68k/kernel-options.txt | 2 -- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/Documentation/devices.txt b/Documentation/devices.txt index 08f01e7..0683e83 100644 --- a/Documentation/devices.txt +++ b/Documentation/devices.txt @@ -498,12 +498,7 @@ Your cooperation is appreciated. Each device type has 5 bits (32 minors). - 13 block 8-bit MFM/RLL/IDE controller - 0 = /dev/xda First XT disk whole disk - 64 = /dev/xdb Second XT disk whole disk - - Partitions are handled in the same way as IDE disks - (see major number 3). + 13 block 14 char Open Sound System (OSS) 0 = /dev/mixer Mixer control diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index c3bfacb..5469dbf 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -3330,9 +3330,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted. plus one apbt timer for broadcast timer. x86_mrst_timer=apbt_only | lapic_and_apbt - xd= [HW,XT] Original XT pre-IDE (RLL encoded) disks. - xd_geo= See header of drivers/block/xd.c. - xen_emul_unplug= [HW,X86,XEN] Unplug Xen emulated devices Format: [unplug0,][unplug1] diff --git a/Documentation/m68k/kernel-options.txt b/Documentation/m68k/kernel-options.txt index 97d45f2..eaf32a1 100644 --- a/Documentation/m68k/kernel-options.txt +++ b/Documentation/m68k/kernel-options.txt @@ -80,8 +80,6 @@ Valid names are: /dev/sdd: -> 0x0830 (forth SCSI disk) /dev/sde: -> 0x0840 (fifth SCSI disk) /dev/fd : -> 0x0200 (floppy disk) - /dev/xda: -> 0x0c00 (first XT disk, unused in Linux/m68k) - /dev/xdb: -> 0x0c40 (second XT disk, unused in Linux/m68k) The name must be followed by a decimal number, that stands for the partition number. Internally, the value of the number is just