From patchwork Tue Feb 20 11:55:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10229907 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C93CE602A7 for ; Tue, 20 Feb 2018 12:03:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB84128558 for ; Tue, 20 Feb 2018 12:03:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B05C528646; Tue, 20 Feb 2018 12:03:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 45E7E28558 for ; Tue, 20 Feb 2018 12:03:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751926AbeBTL7r (ORCPT ); Tue, 20 Feb 2018 06:59:47 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:59105 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751460AbeBTL7o (ORCPT ); Tue, 20 Feb 2018 06:59:44 -0500 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.145]) with ESMTPA (Nemesis) id 0MBBkT-1ew6nt1Mqz-00ADpI; Tue, 20 Feb 2018 12:59:20 +0100 From: Arnd Bergmann To: stable@vger.kernel.org Cc: Greg KH , linux-kernel@vger.kernel.org, Andy Lutomirski , Arnd Bergmann , Darren Hart , Darren Hart , =?UTF-8?q?Pali=20Roh=C3=A1r?= , platform-driver-x86@vger.kernel.org Subject: [4.4-stable 13/22] dell-wmi, dell-laptop: depends DMI Date: Tue, 20 Feb 2018 12:55:00 +0100 Message-Id: <20180220115527.1806578-14-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180220115527.1806578-1-arnd@arndb.de> References: <20180220115527.1806578-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K0:b5Ut8s2T8htKC4DXQSbr4hpszt1ZXSQvKIVA6tcYtKDA/JQ9Otp naErxc9sDT6bL5rjg9J7T9P8xpcg1cKZLY/o07MojvyLatHOrVPnXPp0ENmXnbs1quDfrX2 daOR9TvLHyl6xii8m/qvA8Q+ACgFZo3VkYSg/eyLL41dm+IbU65LVhFXbhnrkU4BQ7Lqwyf NH28GlcqFYjXTyaghMINA== X-UI-Out-Filterresults: notjunk:1; V01:K0:QuHlbSaF4B4=:e78zY1H+b9WnLcOJNUbvTm vv1J2ZfZxFvrduvO6WkDplhZjYKT8NmMQRR9Ir90T6CT5rtVDJjnz8tzsSN7yHu0jx849LVMP WYjGhw86oil/NC0oHGH14U55XLNbiCdvHZiI3rDfy/7XENnvBEGR/1cNHG0eovDGdqpho3yPW fRTUHEYabnk5GQqOPRW8cHzzKxFI+K4qjSIedP3LTeoutIjlYHsFKffDMj7iIYckGTBiysLcN 5OcT4+C4g7z5X8NyA0MRj0mCYBBaRu3GxVpXQXjEIwF04rtqlFWbI3NaYEfmt5UaNZZGRjAMj uCELyCvhWw6V2GcCFBBSUaugbCQv8AyNDASZiPAi+hSxds1vyXDdkXkzM9gWAvF5k7mr/hiJo 6/AG3Z73fXsBjPJWr/lqpPQ8xZ5Dt6A7H2xksA/gHXT2J9LXboooDdPYnhRnwL+C2gmUmq3IO TGsg4pTZRWQat7UCo26WYM1UK03bS4VDXWUo//JK3II6Th0/sd/bZX8s2eSaDrXPFVA0ikCDl 4Qb9gaiW0I87XOr8abmYn5viExEgv99nY2z8suarkhvW41dizoE64dju2JJtLR4H1KTxpQ0LD N1/TVCB/zzgzP9xqkpLSosNH0HnFY+89SkwaEgYpqKKwOXlB1RyVIO2o8lDuAWitmfXP5j1ky dpXBg9dBh+1IHmMDXdpuHwxTO5R7s1B9R9qHabvZfb206ND/nLyRnIMNuc8xEn/7mc1C7zlC0 8tMxVtEC5Uo2EkZ/7FqnuQw5qujiLzlTweePLt8YPNnbg/54gctHfmU5nzg= Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Andy Lutomirski commit a570af4850043260b87fb1b8aa27a4484e648878 upstream. dell-wmi and dell-laptop will compile but won't work right if DMI isn't selected. Signed-off-by: Andy Lutomirski Acked-by: Pali Rohár [arnd: Use depends instead of selects to avoid recursive dependencies] Signed-off-by: Arnd Bergmann Signed-off-by: Darren Hart [arnd: rebase to 4.4-stable] Signed-off-by: Arnd Bergmann --- drivers/platform/x86/Kconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 1089eaa02b00..988ebe9a6b90 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -95,6 +95,7 @@ config DELL_LAPTOP tristate "Dell Laptop Extras" depends on X86 depends on DCDBAS + depends on DMI depends on BACKLIGHT_CLASS_DEVICE depends on ACPI_VIDEO || ACPI_VIDEO = n depends on RFKILL || RFKILL = n @@ -110,6 +111,7 @@ config DELL_LAPTOP config DELL_WMI tristate "Dell WMI extras" depends on ACPI_WMI + depends on DMI depends on INPUT depends on ACPI_VIDEO || ACPI_VIDEO = n select INPUT_SPARSEKMAP