From patchwork Tue Nov 6 13:15:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 12683 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 98D9823E00 for ; Tue, 6 Nov 2012 13:15:33 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 2A970A19BE6 for ; Tue, 6 Nov 2012 13:15:33 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so490428iej.11 for ; Tue, 06 Nov 2012 05:15:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:mime-version:content-type :x-gm-message-state; bh=sQ34CU1yYLgJxAbhyJmEy4EMB2v+mLqrJWRtdyt2OSE=; b=PXDa013qTKQ5h6mQ0kVlDJ47CJJFA+DVv66DPivVQtS/rmOfR54KQIFdLfhVrCz+M8 vk/irmUpYc+ldYckrEwoWX0fbuk2E7KgQWWbP287RG0naihIAp5QACjJyNAYkcv0oftI y2yHY2WWVpvkVt7erc8NgTZnyE6Mrz9nOzl7IYZEE6w90J94PhEpk+/9WjiAT1kSel0C kcFmtfwiILu2vofJmhzeU4Whpgy6XAdz3/JP4ErTH8bMpQ3oraBrKuxQDnI+VBoh+Fws 2CDpzNf94U+49N4aqX9S8t2ErVCwLUsXJbj6SzMDRvEXFiYDAf30f5o3WmZyTjzEs2Rw Hppg== Received: by 10.50.173.34 with SMTP id bh2mr816550igc.70.1352207732956; Tue, 06 Nov 2012 05:15:32 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp39693igt; Tue, 6 Nov 2012 05:15:32 -0800 (PST) Received: by 10.180.75.161 with SMTP id d1mr18656975wiw.1.1352207731856; Tue, 06 Nov 2012 05:15:31 -0800 (PST) Received: from eu1sys200aog105.obsmtp.com (eu1sys200aog105.obsmtp.com [207.126.144.119]) by mx.google.com with SMTP id l45si9916413eep.63.2012.11.06.05.15.28 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 06 Nov 2012 05:15:31 -0800 (PST) Received-SPF: neutral (google.com: 207.126.144.119 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.119; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.119 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) smtp.mail=linus.walleij@stericsson.com Received: from beta.dmz-us.st.com ([167.4.1.35]) (using TLSv1) by eu1sys200aob105.postini.com ([207.126.147.11]) with SMTP ID DSNKUJkNcJk6E33wNaLv0Zgcch6MWCMVNI01@postini.com; Tue, 06 Nov 2012 13:15:31 UTC Received: from zeta.dmz-us.st.com (ns4.st.com [167.4.16.71]) by beta.dmz-us.st.com (STMicroelectronics) with ESMTP id A8CA544; Tue, 6 Nov 2012 13:14:50 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-us.st.com (STMicroelectronics) with ESMTP id A44FB4A; Tue, 6 Nov 2012 08:33:16 +0000 (GMT) Received: from exdcvycastm004.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm004", Issuer "exdcvycastm004" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id 21266A807B; Tue, 6 Nov 2012 14:15:19 +0100 (CET) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.2) with Microsoft SMTP Server (TLS) id 8.3.83.0; Tue, 6 Nov 2012 14:15:23 +0100 From: Linus Walleij To: Cc: Anmar Oueja , Linus Walleij Subject: [PATCH 3/9] ARM: ux500: delete duplicate macro Date: Tue, 6 Nov 2012 14:15:21 +0100 Message-ID: <1352207721-7883-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQnHhir65VqYB0piDoyrMQ498PjCGKfakU7dzKJ4qgsnTZqBkUYiWHSTa3z5789+nYGxdfFV From: Linus Walleij Some merge mishap has caused the DB8500_PIN_SLEEP() macro to appear twice. Get rid of the suplus copy. Signed-off-by: Linus Walleij --- arch/arm/mach-ux500/board-mop500-pins.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c index 9c9e465..7c784f5 100644 --- a/arch/arm/mach-ux500/board-mop500-pins.c +++ b/arch/arm/mach-ux500/board-mop500-pins.c @@ -77,10 +77,6 @@ BIAS(slpm_in_nopull_wkup_pdis, PIN_SLEEPMODE_ENABLED|PIN_SLPM_INPUT_NOPULL|PIN_S PIN_MAP_CONFIGS_PIN(dev, PINCTRL_STATE_SLEEP, "pinctrl-db8500", \ pin, conf) -#define DB8500_PIN_SLEEP(pin,conf,dev) \ - PIN_MAP_CONFIGS_PIN(dev, PINCTRL_STATE_SLEEP, "pinctrl-db8500", \ - pin, conf) - /* Pin control settings */ static struct pinctrl_map __initdata mop500_family_pinmap[] = { /*