From patchwork Mon Sep 17 05:34:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 1465161 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id C1759DFFFF for ; Mon, 17 Sep 2012 05:41:52 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TDU1y-0002jb-Ki; Mon, 17 Sep 2012 05:38:02 +0000 Received: from mail-pb0-f49.google.com ([209.85.160.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TDTzY-0001fZ-08 for linux-arm-kernel@lists.infradead.org; Mon, 17 Sep 2012 05:35:33 +0000 Received: by mail-pb0-f49.google.com with SMTP id rq8so9280889pbb.36 for ; Sun, 16 Sep 2012 22:35:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=Tk1ZRiQHP34e7vs8CXXNupg8iEH0yw38hbSNkLIL0eg=; b=Qe3peVKzN7d2gLh+QgIpUy1Umvd9cjn4QGFxOn378ZfJPfRY6yp3lIaAf9Zxr09Ni6 EpvYRqFOi7Mcljiv/05FL2roJzv1YWwgJp4+J+CLiI2jb5wZOo61CKe5qg0SCzi7RWvn E699vrI70Mnp7CUAue7gS/7nFNwEB5lPHZ1P9LPaqI1sh/ELn4BxmxUJfch1NVi7QzoP bXlmTZ0vrlhxgaFDwRdS+R499/3M4OSbfn75PS34zHEtdf/3jNJ7Y/6j9Wuf9zMRkl0f pHFjJLLfQsM45DyLWQjxhSgC8o58mTB105pAjJYf2Hxk1ptoeOQNWyLkAcr/JZyYYju8 wEJg== Received: by 10.68.138.163 with SMTP id qr3mr20238893pbb.161.1347860131740; Sun, 16 Sep 2012 22:35:31 -0700 (PDT) Received: from S2101-09.ap.freescale.net ([221.225.141.190]) by mx.google.com with ESMTPS id it6sm6386097pbc.14.2012.09.16.22.35.27 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 16 Sep 2012 22:35:31 -0700 (PDT) From: Shawn Guo To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 08/34] ARM: imx: ARM: imx: include cpuidle.h rather than mach/cpuidle.h Date: Mon, 17 Sep 2012 13:34:37 +0800 Message-Id: <1347860103-4141-9-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1347860103-4141-1-git-send-email-shawn.guo@linaro.org> References: <1347860103-4141-1-git-send-email-shawn.guo@linaro.org> X-Gm-Message-State: ALoCoQlh4HDYx+an4i6yAluijMatNw5vAxdpPWwWKsgeUQobbCp4LjUDqRl0nZ3lIQH+N3DqFGJ7 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Fabio Estevam , Sascha Hauer , Shawn Guo , Arnd Bergmann , Rob Herring 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 Rename mach-imx/include/mach/cpuidle.h to mach-imx/cpuidle.h, and update users to include cpuidle.h rather than mach/cpuidle.h. Signed-off-by: Shawn Guo --- arch/arm/mach-imx/{include/mach => }/cpuidle.h | 0 arch/arm/mach-imx/mach-imx6q.c | 2 +- arch/arm/mach-imx/pm-imx5.c | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename arch/arm/mach-imx/{include/mach => }/cpuidle.h (100%) diff --git a/arch/arm/mach-imx/include/mach/cpuidle.h b/arch/arm/mach-imx/cpuidle.h similarity index 100% rename from arch/arm/mach-imx/include/mach/cpuidle.h rename to arch/arm/mach-imx/cpuidle.h diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index 96d817b..b74f02f 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@ -32,10 +32,10 @@ #include #include #include -#include #include #include "common.h" +#include "cpuidle.h" void imx6q_restart(char mode, const char *cmd) { diff --git a/arch/arm/mach-imx/pm-imx5.c b/arch/arm/mach-imx/pm-imx5.c index 9fead8c..a614702 100644 --- a/arch/arm/mach-imx/pm-imx5.c +++ b/arch/arm/mach-imx/pm-imx5.c @@ -16,10 +16,10 @@ #include #include #include -#include #include #include "common.h" +#include "cpuidle.h" #include "crm-regs-imx5.h" /*