From a52e57004db8b2ea71e2aef327c0dbc614d26d58 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Thu, 27 Sep 2012 17:11:15 -0700 Subject: [PATCH] --- yaml --- r: 339647 b: refs/heads/master c: e6a6e5ad17ee090f8d48a3b0758338a97124539f h: refs/heads/master i: 339645: f86ee48ef7b332aaa2f0d9b74b249699ae4b0139 339643: b6f5af8f1b47dab4be49d9838416f59c661d26c9 339639: 8d6d4df3c31cb811ddd447c9d344be7458bb6328 339631: c0f6d2f0b3474f8d3ee2f8ece6d9dcd4d3fd9245 339615: 7d8bdd0d06cdc3e5eb85baf5a13dd48147904d43 339583: b3c3d7f46ae8ac116f0e478cd37f6a2b87d87e06 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap1/common.h | 2 +- trunk/arch/arm/mach-omap2/cm33xx.c | 2 +- trunk/arch/arm/mach-omap2/common.h | 3 ++- .../arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 2 +- trunk/arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 3 ++- trunk/arch/arm/mach-omap2/prm33xx.c | 2 +- trunk/arch/arm/mach-omap2/prm_common.c | 2 +- trunk/arch/arm/plat-omap/common.c | 2 +- trunk/arch/arm/plat-omap/{include/plat => }/common.h | 7 ++----- trunk/arch/arm/plat-omap/counter_32k.c | 2 +- 11 files changed, 14 insertions(+), 15 deletions(-) rename trunk/arch/arm/plat-omap/{include/plat => }/common.h (92%) diff --git a/[refs] b/[refs] index c1a3f53952a8..6d64e6a510e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a8761c0272c961c707e5af2eb0179adf3ef7e14 +refs/heads/master: e6a6e5ad17ee090f8d48a3b0758338a97124539f diff --git a/trunk/arch/arm/mach-omap1/common.h b/trunk/arch/arm/mach-omap1/common.h index c96c1320b001..26e19d3b7924 100644 --- a/trunk/arch/arm/mach-omap1/common.h +++ b/trunk/arch/arm/mach-omap1/common.h @@ -26,7 +26,7 @@ #ifndef __ARCH_ARM_MACH_OMAP1_COMMON_H #define __ARCH_ARM_MACH_OMAP1_COMMON_H -#include +#include "../plat-omap/common.h" #include #include diff --git a/trunk/arch/arm/mach-omap2/cm33xx.c b/trunk/arch/arm/mach-omap2/cm33xx.c index 13f56eafef03..b4938abf28cc 100644 --- a/trunk/arch/arm/mach-omap2/cm33xx.c +++ b/trunk/arch/arm/mach-omap2/cm33xx.c @@ -22,7 +22,7 @@ #include #include -#include +#include "../plat-omap/common.h" #include "cm.h" #include "cm33xx.h" diff --git a/trunk/arch/arm/mach-omap2/common.h b/trunk/arch/arm/mach-omap2/common.h index a68b421b3f86..b91b2a2308aa 100644 --- a/trunk/arch/arm/mach-omap2/common.h +++ b/trunk/arch/arm/mach-omap2/common.h @@ -36,7 +36,8 @@ #include #include -#include + +#include "../plat-omap/common.h" #include "i2c.h" diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c b/trunk/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c index 2420097d29f5..bfe64ee20606 100644 --- a/trunk/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c +++ b/trunk/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include "../plat-omap/common.h" #include "hdq1w.h" #include "omap_hwmod_common_data.h" diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/trunk/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index 2c736cd2bea1..0cee55135e29 100644 --- a/trunk/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/trunk/arch/arm/mach-omap2/omap_hwmod_44xx_data.c @@ -28,9 +28,10 @@ #include #include #include -#include #include +#include "../plat-omap/common.h" + #include "omap_hwmod_common_data.h" #include "cm1_44xx.h" #include "cm2_44xx.h" diff --git a/trunk/arch/arm/mach-omap2/prm33xx.c b/trunk/arch/arm/mach-omap2/prm33xx.c index e7dbb6cf1255..624ade5c3c33 100644 --- a/trunk/arch/arm/mach-omap2/prm33xx.c +++ b/trunk/arch/arm/mach-omap2/prm33xx.c @@ -19,7 +19,7 @@ #include #include -#include +#include "../plat-omap/common.h" #include "common.h" #include "prm33xx.h" diff --git a/trunk/arch/arm/mach-omap2/prm_common.c b/trunk/arch/arm/mach-omap2/prm_common.c index 6b4d332be2f6..6fabbd816d6b 100644 --- a/trunk/arch/arm/mach-omap2/prm_common.c +++ b/trunk/arch/arm/mach-omap2/prm_common.c @@ -24,7 +24,7 @@ #include #include -#include +#include "../plat-omap/common.h" #include #include "prm2xxx_3xxx.h" diff --git a/trunk/arch/arm/plat-omap/common.c b/trunk/arch/arm/plat-omap/common.c index b388e87b522b..2a9db0128a96 100644 --- a/trunk/arch/arm/plat-omap/common.c +++ b/trunk/arch/arm/plat-omap/common.c @@ -16,7 +16,7 @@ #include #include -#include +#include "common.h" #include #include #include diff --git a/trunk/arch/arm/plat-omap/include/plat/common.h b/trunk/arch/arm/plat-omap/common.h similarity index 92% rename from trunk/arch/arm/plat-omap/include/plat/common.h rename to trunk/arch/arm/plat-omap/common.h index 55c0f8bfc85b..e196d1300157 100644 --- a/trunk/arch/arm/plat-omap/include/plat/common.h +++ b/trunk/arch/arm/plat-omap/common.h @@ -1,7 +1,5 @@ /* - * arch/arm/plat-omap/include/mach/common.h - * - * Header for code common to all OMAP machines. + * Header for shared OMAP code in plat-omap. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -27,13 +25,12 @@ #ifndef __ARCH_ARM_MACH_OMAP_COMMON_H #define __ARCH_ARM_MACH_OMAP_COMMON_H -#include - extern int __init omap_init_clocksource_32k(void __iomem *vbase); extern void __init omap_check_revision(void); extern void omap_reserve(void); +struct omap_hwmod; extern int omap_dss_reset(struct omap_hwmod *); void omap_sram_init(void); diff --git a/trunk/arch/arm/plat-omap/counter_32k.c b/trunk/arch/arm/plat-omap/counter_32k.c index 87ba8dd0d791..8e847de4c744 100644 --- a/trunk/arch/arm/plat-omap/counter_32k.c +++ b/trunk/arch/arm/plat-omap/counter_32k.c @@ -22,7 +22,7 @@ #include #include -#include +#include "common.h" #include /* OMAP2_32KSYNCNT_CR_OFF: offset of 32ksync counter register */