From patchwork Thu Jul 5 01:12:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 1157731 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 9940DDFF0F for ; Thu, 5 Jul 2012 01:12:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751373Ab2GEBML (ORCPT ); Wed, 4 Jul 2012 21:12:11 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:48763 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751281Ab2GEBML (ORCPT ); Wed, 4 Jul 2012 21:12:11 -0400 Received: by pbbrp8 with SMTP id rp8so11890498pbb.19 for ; Wed, 04 Jul 2012 18:12:10 -0700 (PDT) Received: by 10.68.222.9 with SMTP id qi9mr23093946pbc.164.1341450730837; Wed, 04 Jul 2012 18:12:10 -0700 (PDT) Received: from localhost ([183.37.192.221]) by mx.google.com with ESMTPS id qp9sm18660916pbc.9.2012.07.04.18.12.08 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 04 Jul 2012 18:12:09 -0700 (PDT) From: Ming Lei To: Chris Ball Cc: linux-mmc@vger.kernel.org, Ming Lei Subject: [PATCH] MMC: OMAP: make MMC_OMAP* depend on DMA_OMAP Date: Thu, 5 Jul 2012 09:12:01 +0800 Message-Id: <1341450721-20993-1-git-send-email-ming.lei@canonical.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org Recent commits on omap mmc/hsmmc in -next tree switch to DMA_ENGINE entirely, so make MMC_OMAP* depend on DMA_OMAP and DMA_ENGINE, otherwise OMAP MMC/HSMMC won't work without enabling DMA_ENGINE and DMA_OMAP. The patch simply make them depend on DMA_OMAP since DMA_OMAP will select DMA_ENGINE automatically. Signed-off-by: Ming Lei --- drivers/mmc/host/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index aa131b3..ef72c50 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -231,7 +231,7 @@ config MMC_SDHCI_S3C_DMA config MMC_OMAP tristate "TI OMAP Multimedia Card Interface support" - depends on ARCH_OMAP + depends on ARCH_OMAP && DMA_OMAP select TPS65010 if MACH_OMAP_H2 help This selects the TI OMAP Multimedia card Interface. @@ -242,7 +242,7 @@ config MMC_OMAP config MMC_OMAP_HS tristate "TI OMAP High Speed Multimedia Card Interface support" - depends on SOC_OMAP2430 || ARCH_OMAP3 || ARCH_OMAP4 + depends on (SOC_OMAP2430 || ARCH_OMAP3 || ARCH_OMAP4) && DMA_OMAP help This selects the TI OMAP High Speed Multimedia card Interface. If you have an OMAP2430 or OMAP3 board or OMAP4 board with a