From patchwork Mon Jan 21 17:16:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2013311 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 3591E40DB3 for ; Mon, 21 Jan 2013 17:23:22 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TxL3I-0006OF-06; Mon, 21 Jan 2013 17:20:56 +0000 Received: from moutng.kundenserver.de ([212.227.17.9]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TxKzd-0003xL-1R for linux-arm-kernel@lists.infradead.org; Mon, 21 Jan 2013 17:17:11 +0000 Received: from wuerfel.lan (HSI-KBW-46-223-90-92.hsi.kabel-badenwuerttemberg.de [46.223.90.92]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0LcTCs-1TEtu01RLi-00k1eI; Mon, 21 Jan 2013 18:16:58 +0100 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 15/15] staging/omapdrm: don't build on multiplatform Date: Mon, 21 Jan 2013 17:16:08 +0000 Message-Id: <1358788568-11137-16-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1358788568-11137-1-git-send-email-arnd@arndb.de> References: <1358788568-11137-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:UFu4rqDPO2bN/gDwE8luIptPtN14ce0GkIZDtbMLyTh Mlg26pgmKfREP6pVI5KUsGrYMg3WPebTYB+KNI3l+8TIFzTKXu cu8qElBfxnmcbNMJnTaa62aunUrzZ4ryOmeYGFhCpdpCboTyOB uKVQYpmQnZsgco+Lq2v+qxKLEx7L/o/Hhj6muHvOHztIf4CMfG VNc3y+Iz/LmQi7s09vTVPQItivmDRETygaEhHiMK0vwghLLayc 53UIsALmyZsLrDeTwpTvKcSDD86v8vHd2LGwfROiHy1kUSylhb pX4lYnj8WROajB4cx67KM3rRu1gqd3A88sAKGmT0XJcKKCoQqA z9vPthep7wNR4kcrtcsTD2uUm8/6kLfZ2rZmiRfBY X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130121_121709_362572_A3D9D457 X-CRM114-Status: GOOD ( 12.30 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.17.9 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Rob Clark , arm@kernel.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Greg Kroah-Hartman X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The omapdrm driver is incorrectly flagged to allow building on non-omap platforms, when ARCH_MULTIPLATFORM is set. This does not work, because it unconditionally selects the OMAP2_DSS symbol that only works on OMAP. The problem was introduced in 5e3b087499 "staging: drm/omap: add support for ARCH_MULTIPLATFORM", which this patch partly reverts. Without this patch, building allyesconfig results in: warning: (VIDEO_OMAP2_VOUT && DRM_OMAP) selects OMAP2_DSS which has unmet direct dependencies (HAS_IOMEM && ARCH_OMAP2PLUS) warning: (VIDEO_OMAP2_VOUT && DRM_OMAP) selects OMAP2_DSS which has unmet direct dependencies (HAS_IOMEM && ARCH_OMAP2PLUS) drivers/video/omap2/dss/dss.c: In function 'dss_calc_clock_div': drivers/video/omap2/dss/dss.c:572:20: error: 'CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK' undeclared (first use in this function) drivers/video/omap2/dss/dss.c:572:20: note: each undeclared identifier is reported only once for each function it appears in drivers/staging/omapdrm/omap_connector.c: In function 'omap_connector_dpms': drivers/staging/omapdrm/omap_connector.c:116:8: error: 'OMAP_DSS_DISPLAY_SUSPENDED' undeclared (first use in this function) drivers/staging/omapdrm/omap_connector.c:116:8: note: each undeclared identifier is reported only once for each function it appears in Signed-off-by: Arnd Bergmann Cc: Rob Clark Cc: Greg Kroah-Hartman --- drivers/staging/omapdrm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/omapdrm/Kconfig b/drivers/staging/omapdrm/Kconfig index b724a41..81a7cba 100644 --- a/drivers/staging/omapdrm/Kconfig +++ b/drivers/staging/omapdrm/Kconfig @@ -2,7 +2,7 @@ config DRM_OMAP tristate "OMAP DRM" depends on DRM && !CONFIG_FB_OMAP2 - depends on ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM + depends on ARCH_OMAP2PLUS select DRM_KMS_HELPER select OMAP2_DSS select FB_SYS_FILLRECT