From patchwork Fri Jun 21 20:33:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2764271 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B93109F756 for ; Fri, 21 Jun 2013 20:34:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E2C9720165 for ; Fri, 21 Jun 2013 20:34:10 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E2A362015B for ; Fri, 21 Jun 2013 20:34:09 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uq822-0002EJ-B0; Fri, 21 Jun 2013 20:34:06 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uq81y-0004pN-CG; Fri, 21 Jun 2013 20:34:02 +0000 Received: from moutng.kundenserver.de ([212.227.126.186]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uq81v-0004nc-4p for linux-arm-kernel@lists.infradead.org; Fri, 21 Jun 2013 20:33:59 +0000 Received: from klappe2.localnet (HSI-KBW-095-208-002-043.hsi5.kabel-badenwuerttemberg.de [95.208.2.43]) by mrelayeu.kundenserver.de (node=mreu0) with ESMTP (Nemesis) id 0Lxrpw-1UBJa119aW-015A6h; Fri, 21 Jun 2013 22:33:29 +0200 From: Arnd Bergmann To: Christoffer Dall Subject: [PATCH] ARM: kvm: don't include drivers/virtio/Kconfig Date: Fri, 21 Jun 2013 22:33:22 +0200 User-Agent: KMail/1.12.2 (Linux/3.8.0-22-generic; KDE/4.3.2; x86_64; ; ) MIME-Version: 1.0 Message-Id: <201306212233.23062.arnd@arndb.de> X-Provags-ID: V02:K0:i8kNyGrYZX0BAR2wIRux9y6uCFv3dLQk5ZDWBTQqv0h jzrqDWP8xJUdkNCtqu4shigCp59LQSusoI0ATQMsJV0XrGQNU1 39AILOwpWixiu1T1kZch9A8ZDk4UmoP0EtAooWHXDRLrliB0K8 z3xPHLeriGZF/FX5Z4E3W4izoNOiL9PloAhzwm8J0LNwslW+b2 EzhYd6qHRQixR3XGWVrvsaMyyvGdHuIdEK8efMh27XuYRnX1Dm vfaq+7zMVEgglW8940WpAulRkmUXZ9DQmnk9QAPUtQnS+sduJU nTT+uscvZha9T25zLxfGsubi6xu8UiEPM27lD0MFA/PKmLbJWx Jg/tasaPHDzym6TG5dUs= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130621_163359_396611_7B0DE2B1 X-CRM114-Status: UNSURE ( 6.81 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) Cc: kvm@vger.kernel.org, Linux ARM Kernel List X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The virtio configuration has recently moved and is now visible everywhere. Including the file again from KVM as we used to need earlier now causes dependency problems: warning: (CAIF_VIRTIO && VIRTIO_PCI && VIRTIO_MMIO && REMOTEPROC && RPMSG) selects VIRTIO which has unmet direct dependencies (VIRTUALIZATION) Cc: Christoffer Dall Signed-off-by: Arnd Bergmann diff --git a/arch/arm/kvm/Kconfig b/arch/arm/kvm/Kconfig index 370e1a8..017db7c 100644 --- a/arch/arm/kvm/Kconfig +++ b/arch/arm/kvm/Kconfig @@ -67,6 +67,4 @@ config KVM_ARM_TIMER ---help--- Adds support for the Architected Timers in virtual machines -source drivers/virtio/Kconfig - endif # VIRTUALIZATION