From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tony Lindgren Subject: [PATCH 08/16] ARM: OMAP2: Move plat/menelaus.h to linux/mfd/menelaus.h Date: Thu, 04 Oct 2012 15:04:52 -0700 Message-ID: <20121004220451.26676.62349.stgit@muffinssi.local> References: <20121004213950.26676.21898.stgit@muffinssi.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Return-path: Received: from mho-04-ewr.mailhop.org ([204.13.248.74]:28027 "EHLO mho-02-ewr.mailhop.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753341Ab2JDWEx (ORCPT ); Thu, 4 Oct 2012 18:04:53 -0400 In-Reply-To: <20121004213950.26676.21898.stgit@muffinssi.local> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: linux-arm-kernel@lists.infradead.org Cc: linux-omap@vger.kernel.org, Samuel Ortiz We can move menelaus.h to live with other mfd headers to get it out of plat for ARM common zImage support. Cc: Samuel Ortiz Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/board-h4.c | 2 +- arch/arm/mach-omap2/board-n8x0.c | 2 +- drivers/mfd/menelaus.c | 2 +- include/linux/mfd/menelaus.h | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) rename arch/arm/plat-omap/include/plat/menelaus.h => include/linux/mfd/menelaus.h (96%) diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c index 8d04bf8..3977a02 100644 --- a/arch/arm/mach-omap2/board-h4.c +++ b/arch/arm/mach-omap2/board-h4.c @@ -26,12 +26,12 @@ #include #include #include +#include #include #include #include -#include #include #include #include "debug-devices.h" diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c index d95f727..e3e8325 100644 --- a/arch/arm/mach-omap2/board-n8x0.c +++ b/arch/arm/mach-omap2/board-n8x0.c @@ -22,13 +22,13 @@ #include #include #include +#include #include #include #include #include "common.h" -#include #include #include "mux.h" diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c index 55d5899..998ce8c 100644 --- a/drivers/mfd/menelaus.c +++ b/drivers/mfd/menelaus.c @@ -41,11 +41,11 @@ #include #include #include +#include #include #include -#include #define DRIVER_NAME "menelaus" diff --git a/arch/arm/plat-omap/include/plat/menelaus.h b/include/linux/mfd/menelaus.h similarity index 96% rename from arch/arm/plat-omap/include/plat/menelaus.h rename to include/linux/mfd/menelaus.h index 4a970ec..f097e89 100644 --- a/arch/arm/plat-omap/include/plat/menelaus.h +++ b/include/linux/mfd/menelaus.h @@ -1,6 +1,4 @@ /* - * arch/arm/plat-omap/include/mach/menelaus.h - * * Functions to access Menelaus power management chip */ From mboxrd@z Thu Jan 1 00:00:00 1970 From: tony@atomide.com (Tony Lindgren) Date: Thu, 04 Oct 2012 15:04:52 -0700 Subject: [PATCH 08/16] ARM: OMAP2: Move plat/menelaus.h to linux/mfd/menelaus.h In-Reply-To: <20121004213950.26676.21898.stgit@muffinssi.local> References: <20121004213950.26676.21898.stgit@muffinssi.local> Message-ID: <20121004220451.26676.62349.stgit@muffinssi.local> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org We can move menelaus.h to live with other mfd headers to get it out of plat for ARM common zImage support. Cc: Samuel Ortiz Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/board-h4.c | 2 +- arch/arm/mach-omap2/board-n8x0.c | 2 +- drivers/mfd/menelaus.c | 2 +- include/linux/mfd/menelaus.h | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) rename arch/arm/plat-omap/include/plat/menelaus.h => include/linux/mfd/menelaus.h (96%) diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c index 8d04bf8..3977a02 100644 --- a/arch/arm/mach-omap2/board-h4.c +++ b/arch/arm/mach-omap2/board-h4.c @@ -26,12 +26,12 @@ #include #include #include +#include #include #include #include -#include #include #include #include "debug-devices.h" diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c index d95f727..e3e8325 100644 --- a/arch/arm/mach-omap2/board-n8x0.c +++ b/arch/arm/mach-omap2/board-n8x0.c @@ -22,13 +22,13 @@ #include #include #include +#include #include #include #include #include "common.h" -#include #include #include "mux.h" diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c index 55d5899..998ce8c 100644 --- a/drivers/mfd/menelaus.c +++ b/drivers/mfd/menelaus.c @@ -41,11 +41,11 @@ #include #include #include +#include #include #include -#include #define DRIVER_NAME "menelaus" diff --git a/arch/arm/plat-omap/include/plat/menelaus.h b/include/linux/mfd/menelaus.h similarity index 96% rename from arch/arm/plat-omap/include/plat/menelaus.h rename to include/linux/mfd/menelaus.h index 4a970ec..f097e89 100644 --- a/arch/arm/plat-omap/include/plat/menelaus.h +++ b/include/linux/mfd/menelaus.h @@ -1,6 +1,4 @@ /* - * arch/arm/plat-omap/include/mach/menelaus.h - * * Functions to access Menelaus power management chip */