From patchwork Thu Oct 4 22:05:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 14905 Received: from bouncing.tu-berlin.de ([130.149.7.34] helo=mail.tu-berlin.de) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1TJtXw-0008LV-9y for patchwork@linuxtv.org; Fri, 05 Oct 2012 00:05:32 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-2) with esmtp for id 1TJtXv-0006x0-H9; Fri, 05 Oct 2012 00:05:32 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753541Ab2JDWFZ (ORCPT ); Thu, 4 Oct 2012 18:05:25 -0400 Received: from mho-03-ewr.mailhop.org ([204.13.248.66]:11443 "EHLO mho-01-ewr.mailhop.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752651Ab2JDWFW (ORCPT ); Thu, 4 Oct 2012 18:05:22 -0400 Received: from c-98-234-237-12.hsd1.ca.comcast.net ([98.234.237.12] helo=muffinssi.local) by mho-01-ewr.mailhop.org with esmtpa (Exim 4.72) (envelope-from ) id 1TJtXc-000CIO-Sb; Thu, 04 Oct 2012 22:05:12 +0000 X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 98.234.237.12 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX19fvdDZw9yporaujr/jPzDI Subject: [PATCH 16/16] ARM: OMAP: Make plat/omap-pm.h local to mach-omap2 To: linux-arm-kernel@lists.infradead.org From: Tony Lindgren Cc: Timo Kokkonen , linux-omap@vger.kernel.org, linux-media@vger.kernel.org, Laurent Pinchart , Mauro Carvalho Chehab Date: Thu, 04 Oct 2012 15:05:10 -0700 Message-ID: <20121004220510.26676.36302.stgit@muffinssi.local> In-Reply-To: <20121004213950.26676.21898.stgit@muffinssi.local> References: <20121004213950.26676.21898.stgit@muffinssi.local> User-Agent: StGit/0.16-2-g0d85 MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.10.4.215414 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, MSGID_ADDED_BY_MTA 0.05, DATE_TZ_NA 0, URI_ENDS_IN_HTML 0, WEBMAIL_SOURCE 0, WEBMAIL_XOIP 0, WEBMAIL_X_IP_HDR 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __STOCK_PHRASE_7 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __USER_AGENT 0' We must move this for ARM common zImage support. Note that neither drivers/media/rc/ir-rx51.c or drivers/media/platform/omap3isp/ispvideo.c need to include omap-pm.h, so this patch removes the include for those files. Cc: Laurent Pinchart Cc: Mauro Carvalho Chehab Cc: Timo Kokkonen Cc: linux-media@vger.kernel.org Signed-off-by: Tony Lindgren Acked-by: Laurent Pinchart --- arch/arm/mach-omap1/pm_bus.c | 2 -- arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +- arch/arm/mach-omap2/display.c | 2 +- arch/arm/mach-omap2/dsp.c | 2 +- arch/arm/mach-omap2/gpio.c | 2 +- arch/arm/mach-omap2/hsmmc.c | 2 +- arch/arm/mach-omap2/i2c.c | 2 +- arch/arm/mach-omap2/io.c | 2 +- arch/arm/mach-omap2/omap-pm.h | 0 arch/arm/mach-omap2/pm-debug.c | 2 +- arch/arm/mach-omap2/pm.c | 2 +- arch/arm/mach-omap2/serial.c | 2 +- arch/arm/mach-omap2/timer.c | 2 +- arch/arm/plat-omap/dmtimer.c | 3 ++- arch/arm/plat-omap/omap-pm-noop.c | 4 +--- drivers/media/platform/omap3isp/ispvideo.c | 1 - drivers/media/rc/ir-rx51.c | 1 - 17 files changed, 14 insertions(+), 19 deletions(-) rename arch/arm/{plat-omap/include/plat/omap-pm.h => mach-omap2/omap-pm.h} (100%) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/mach-omap1/pm_bus.c b/arch/arm/mach-omap1/pm_bus.c index 8a74ec5..16bf2f9 100644 --- a/arch/arm/mach-omap1/pm_bus.c +++ b/arch/arm/mach-omap1/pm_bus.c @@ -19,8 +19,6 @@ #include #include -#include - #ifdef CONFIG_PM_RUNTIME static int omap1_pm_runtime_suspend(struct device *dev) { diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index ed85fb8..0199b24 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c @@ -33,7 +33,7 @@ #include "common.h" #include #include -#include +#include "omap-pm.h" #include "gpmc-smc91x.h" #include "board-rx51.h" diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c index 261f79f..bfa3e4c 100644 --- a/arch/arm/mach-omap2/display.c +++ b/arch/arm/mach-omap2/display.c @@ -27,7 +27,7 @@ #include