From patchwork Mon Oct 4 16:53:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 228831 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o94HOq2Q004239 for ; Mon, 4 Oct 2010 17:25:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753553Ab0JDQxj (ORCPT ); Mon, 4 Oct 2010 12:53:39 -0400 Received: from mail-pv0-f174.google.com ([74.125.83.174]:47374 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753006Ab0JDQxj (ORCPT ); Mon, 4 Oct 2010 12:53:39 -0400 Received: by pvg2 with SMTP id 2so1385365pvg.19 for ; Mon, 04 Oct 2010 09:53:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=eVu9BSjw3ldtqA/Csgat1Q0IrlAR9Zjdt3llrunkaKY=; b=pVMqMb+vuhg0h0b5HBaXBs/mZY+qQHO43DyBVaD3WsSV4Hp+4ZWxau/A21uXysrJia /DRAYX5wdOsrOQG7nMGJy0oAT3y08eMxTQA+zwBDURDKoIRnopOQOrAt/b6kfxyFGp7b 7LMGbz3bBBDy8GGwKyo2p8lOGrhsOWtj+KMuQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=RkFxpgBb3VvOs/W2ESjhCgwq4484zNVYAzbRWrm4DU6HUQzia0M6DFVlXz7XpARH3s TANYZtpDLalxSv+OZbB0UNl47aW3I0hGWlJNxeu6C/J6QFGStDIw/ySLFEGHbaw822A0 JF/kenvhWKwLdSISinmGXI0fBLWdgFTa2b8WU= Received: by 10.114.24.15 with SMTP id 15mr11869205wax.122.1286211218763; Mon, 04 Oct 2010 09:53:38 -0700 (PDT) Received: from localhost ([116.77.213.72]) by mx.google.com with ESMTPS id x9sm9673999waj.15.2010.10.04.09.53.34 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 04 Oct 2010 09:53:37 -0700 (PDT) From: tom.leiming@gmail.com To: tony@atomide.com, khilman@deeprootsystems.com Cc: linux-omap@vger.kernel.org, Ming Lei Subject: [PATCH] OMAP: mmc: remove ifdef in omap_mmc_platform_data defination Date: Tue, 5 Oct 2010 00:53:21 +0800 Message-Id: <1286211201-31168-1-git-send-email-tom.leiming@gmail.com> X-Mailer: git-send-email 1.7.3 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 04 Oct 2010 17:25:36 +0000 (UTC) diff --git a/arch/arm/plat-omap/include/plat/mmc.h b/arch/arm/plat-omap/include/plat/mmc.h index 3107892..f57f36a 100644 --- a/arch/arm/plat-omap/include/plat/mmc.h +++ b/arch/arm/plat-omap/include/plat/mmc.h @@ -80,12 +80,8 @@ struct omap_mmc_platform_data { * 4/8 wires and any additional host capabilities * need to OR'd all capabilities (ref. linux/mmc/host.h) */ -#if defined(CONFIG_ARCH_OMAP1) || defined(CONFIG_ARCH_OMAP2420) u8 wires; /* Used for the MMC driver on omap1 and 2420 */ -#endif -#ifdef CONFIG_ARCH_OMAP2PLUS u32 caps; /* Used for the MMC driver on 2430 and later */ -#endif /* * nomux means "standard" muxing is wrong on this board, and