From patchwork Thu Nov 2 11:19:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 833308 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ide-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ySN0x6pd8z9s8J for ; Thu, 2 Nov 2017 22:20:17 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755230AbdKBLUQ (ORCPT ); Thu, 2 Nov 2017 07:20:16 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:56302 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752865AbdKBLUP (ORCPT ); Thu, 2 Nov 2017 07:20:15 -0400 Received: from wuerfel.lan ([109.193.157.232]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.145]) with ESMTPA (Nemesis) id 0LrKaC-1d9Ggy1B7M-013904; Thu, 02 Nov 2017 12:19:56 +0100 From: Arnd Bergmann To: Jens Axboe Cc: Arnd Bergmann , "David S. Miller" , "James E.J. Bottomley" , "Martin K. Petersen" , Bart Van Assche , Hannes Reinecke , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org Subject: [PATCH] block: fix CDROM dependency on BLK_DEV Date: Thu, 2 Nov 2017 12:19:32 +0100 Message-Id: <20171102111952.4021454-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:oZFCru2LmMp7rkSgHsVHmG7fJ4295wQs1p5Vt19klhkgLRcZNhx ++KP4XaFtwRN97wRVu1RP3ELjWLtp9L0kbPtPVroRMx9YWBxwBO9a08N7j2PVqdfvPq/F+b BOCdelY0mz76Ns2fS8iwZgsBofSts1xwWWTVC/QGA0Ncqst2hEtxICn4F2qEOcPMtL6BrVi G9OjlHlNYTfAu5W2tqAtA== X-UI-Out-Filterresults: notjunk:1; V01:K0:ttSNPnIsqm8=:HNR37xmXoYqRTGbhOUX+94 F95P3s0LBqhy1ORs5KWA05nPJmrPaL86ttbyu7J3cBv2+MDx7l9ppyebUmRruHIuDLxgYL2Ch AHQFdTCVgJAegPPoAGG8IbQFTHjqX5nerldJLjFtDtGXFllh7NwzTvWx+LgXR1lzVHQ4azmvQ M68s9JD+xUv5X7LSwOT8ZgN/daB6fNAWEh7uVRv7XJfRKXFVKwJgKoPFsOoS+hO338clIMX0Y wJmFcneluJfg1B7IyAYCeP0kWFqY1dugwHLSFcpImbTNpyrcaF/KooohWhck1x5GqlGcY6Po2 qmwhPUqlo1BydPT5TGJOFgw4V7ab1dU5vOpdxdOgr8Vm+8rAfFSPoT1ZkV+V5xqE3o+njTxwC Bv4NtelIFAsd6UXd4f9MxcnVptuDC6U7WVR417Sqr3PtzUfbuVVNXBwsX4v8UxbAN7eBbslNW IiemQ5ifkMGWVnftZ4VBV+WAQ/iyUTgWjSFvZaGkD68PzELen3pM3MykKyqHgduYhJtNbXQl7 QpMZ2vpZO/GyM06//Iq+QahXsi22VO3SYoWQ9zoKudsxLvVh5S5AxHZ9ozlTyYxqnOLK0giGY yuQjwbLZh3j0yLS7+JGO8PTIgI0MHWJvuhRoANUF1RUdP+R2SmUYoX3TDTRfTK012Qbl8u7Bd BwogPr8Kc/iW6HVpCzRZcVPHeO1OSl06iK39RQXx18wOXyGBB7BDkrSLcIPVSdAeIjcsrvXMP xnz0QJ9EQMGVXlkHm4BaB+968Vn/wCxsF7XBLQ== Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org After the cdrom cleanup, I get randconfig warnings for some configurations: warning: (BLK_DEV_IDECD && BLK_DEV_SR) selects CDROM which has unmet direct dependencies (BLK_DEV) This adds an explicit BLK_DEV dependency for both drivers. The other drivers that select 'CDROM' already have this and don't need a change. Fixes: 2a750166a5be ("block: Rework drivers/cdrom/Makefile") Signed-off-by: Arnd Bergmann --- drivers/ide/Kconfig | 1 + drivers/scsi/Kconfig | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index 7b92c591e4c1..cf1fb3fb5d26 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig @@ -117,6 +117,7 @@ config BLK_DEV_DELKIN config BLK_DEV_IDECD tristate "Include IDE/ATAPI CDROM support" + depends on BLK_DEV select IDE_ATAPI select CDROM ---help--- diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 1f98f666d2ef..8a739b74cfb7 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig @@ -130,7 +130,7 @@ config CHR_DEV_OSST config BLK_DEV_SR tristate "SCSI CDROM support" - depends on SCSI + depends on SCSI && BLK_DEV select CDROM ---help--- If you want to use a CD or DVD drive attached to your computer