From patchwork Fri Sep 13 10:53:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 20022 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f70.google.com (mail-yh0-f70.google.com [209.85.213.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D84CC25E09 for ; Fri, 13 Sep 2013 10:53:37 +0000 (UTC) Received: by mail-yh0-f70.google.com with SMTP id i72sf1076021yha.1 for ; Fri, 13 Sep 2013 03:53:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=DF4UlnB+mVqJ3YeJpR/Qz4p3N6F/EHDar9CR+zw/zsM=; b=KfH2W/7fVZnKyMnmNJ6j+aZKYu9p/6b3NHHjSHq+XiKW4EkQNVVKmzmePUJOR7SzZB 3fe8p4UihcHchSsR9CT5tO7gR66qvSY60YS6NTNTKWk5J259p5gvMHBeX5D8WgFyMLvp 1I3Kio7XMpAVwZ9TBXNt5dmRvSQP8/Ocw4OsTqJgaaWMuRMe+2Dkf74Vk/aQaZQ4tqG2 kexZ6B1XnoOjorvPYL16axTDmZgKfHpsWJpwQRDs6xnLZ3dKWAn9GzQoSq1KWH2SEuYG 0ciLgHfKUMrC4kqOLkoxwNnOmEax9/vpA6WWdT7uVRhnBqmmy2sW/fSuenBL7mqrWMKb kC+Q== X-Gm-Message-State: ALoCoQmIim5LVQcCZNF/zp/Q4XtwdXof9zZ4bkgS8MV2VhBEEVW3rn5Kl0l7Dw+RQjzS23y2mlmA X-Received: by 10.236.94.205 with SMTP id n53mr4766215yhf.44.1379069617637; Fri, 13 Sep 2013 03:53:37 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.2.166 with SMTP id 6ls1087306qev.69.gmail; Fri, 13 Sep 2013 03:53:37 -0700 (PDT) X-Received: by 10.220.1.203 with SMTP id 11mr11372883vcg.15.1379069617421; Fri, 13 Sep 2013 03:53:37 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id tq4si2920478vdc.142.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Sep 2013 03:53:37 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id m17so787980vca.31 for ; Fri, 13 Sep 2013 03:53:37 -0700 (PDT) X-Received: by 10.52.173.165 with SMTP id bl5mr9917855vdc.18.1379069617312; Fri, 13 Sep 2013 03:53:37 -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.174.196 with SMTP id u4csp73794vcz; Fri, 13 Sep 2013 03:53:36 -0700 (PDT) X-Received: by 10.152.5.162 with SMTP id t2mr10400667lat.1.1379069616028; Fri, 13 Sep 2013 03:53:36 -0700 (PDT) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com [209.85.215.52]) by mx.google.com with ESMTPS id t6si3525552lag.110.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Sep 2013 03:53:35 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.52 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=209.85.215.52; Received: by mail-la0-f52.google.com with SMTP id ev20so867866lab.11 for ; Fri, 13 Sep 2013 03:53:35 -0700 (PDT) X-Received: by 10.152.7.8 with SMTP id f8mr1167474laa.31.1379069615241; Fri, 13 Sep 2013 03:53:35 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id vs11sm4027583lac.3.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 13 Sep 2013 03:53:34 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, Alexander Schulz , "David S. Miller" Cc: Jens Axboe , Dmitry Torokhov , Russell King , Jean-Christophe Plagniol-Villard , Tomi Valkeinen , arm@kernel.org, Linus Walleij Subject: [PATCH 4/6] ide: drop dependency on ARCH_SHARK Date: Fri, 13 Sep 2013 12:53:27 +0200 Message-Id: <1379069607-4184-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.3.1 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.172 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: , This drops the selection of default IDE chipset for the Shark machine as it has been deleted. Cc: David S. Miller Signed-off-by: Linus Walleij --- Hi David, I am seeking an ACK to take this through the ARM SoC tree as part of the deletion of the Shark machine. Please do not apply it to your tree. --- drivers/ide/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index 02906ca..3f7f59c 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig @@ -197,8 +197,8 @@ comment "IDE chipset support/bugfixes" config IDE_GENERIC tristate "generic/default IDE chipset support" - depends on ALPHA || X86 || IA64 || M32R || MIPS || ARCH_RPC || ARCH_SHARK - default ARM && (ARCH_RPC || ARCH_SHARK) + depends on ALPHA || X86 || IA64 || M32R || MIPS || ARCH_RPC + default ARM && ARCH_RPC help This is the generic IDE driver. This driver attaches to the fixed legacy ports (e.g. on PCs 0x1f0/0x170, 0x1e8/0x168 and