From patchwork Thu Sep 20 06:45:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 185322 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (unknown [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 26FC72C007D for ; Thu, 20 Sep 2012 16:51:54 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TEaZB-0002bx-5p; Thu, 20 Sep 2012 06:48:53 +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 1TEaWz-0001V9-Fi for linux-arm-kernel@lists.infradead.org; Thu, 20 Sep 2012 06:46:39 +0000 Received: by mail-pb0-f49.google.com with SMTP id rq8so4537375pbb.36 for ; Wed, 19 Sep 2012 23:46:37 -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=+G5bwslKX9Rc6xEQeRlB+GkJ1mS18MGy2b+smEH2QBU=; b=QZ/sdol/Vus2984f4AaOIjYLpRxK+JJjCMHS0XvIB2c6D8TFMFFMQqa/zT0XCaViki XhDnKfkuCOjjSLxLri4HOgRSLFmFrkJtHG9ZOxlmSeRLfp17Tthc2Rx0IAmyQumJBLL1 y3QIcdNxkw7dcQfk291IUeZ1HCwEDVe54K8dSbxnZmnJ4kgXrXtrmXU0txYMlPouz6tN U1HxlqmSUw8ck9WUV4DyoLH0phlxl4ZRozEUV7QibYAA029H0mPadT8y3AWQx5NFWSvQ RMcEsvG1jbLQd+wQAzODt6U3Okc2sW3l1dEdAa1tJuWfEzdq1cKhnK+ya6x3o8Xu1IP3 wdYw== Received: by 10.68.222.37 with SMTP id qj5mr3997841pbc.132.1348123597175; Wed, 19 Sep 2012 23:46:37 -0700 (PDT) Received: from S2101-09.ap.freescale.net ([114.216.234.161]) by mx.google.com with ESMTPS id wn1sm3057024pbc.57.2012.09.19.23.46.33 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 19 Sep 2012 23:46:36 -0700 (PDT) From: Shawn Guo To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 07/34] ARM: imx: ARM: imx: include cpuidle.h rather than mach/cpuidle.h Date: Thu, 20 Sep 2012 14:45:20 +0800 Message-Id: <1348123547-31082-8-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1348123547-31082-1-git-send-email-shawn.guo@linaro.org> References: <1348123547-31082-1-git-send-email-shawn.guo@linaro.org> X-Gm-Message-State: ALoCoQkX/cnpcgWgR1X5UD94wq1pFkWDdWMvIJOQc/aOLqEBriTBIivOd2sdt7GWH1vngwZAvir9 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: Sascha Hauer , Shawn Guo , Arnd Bergmann , Javier Martin , Rob Herring X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list 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+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.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 Acked-by: Sascha Hauer Acked-by: Arnd Bergmann --- 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 455673e..33ddb49 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" /*