diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2011-01-26 16:20:53 -0800 |
|---|---|---|
| committer | David Brown <davidb@codeaurora.org> | 2011-01-28 11:20:47 -0800 |
| commit | ce1c80fbaa3b8e132d4e430cbf7cb4a9cd28b2d5 (patch) | |
| tree | 6f9b5cd08bafc6f62ffe0c23c4a0b1a3297c29ba | |
| parent | 437f629d4ea0a574b6102101fe4a51232a7cc105 (diff) | |
msm: clock: Remove 7x30 and pcom includes from clock.h
clock.h includes clock-pcom.h and clock-7x30.h when it really
doesn't need to. Remove the includes and fixup breakages.
Reviewed-By: Saravana Kannan <skannan@codeaurora.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
| -rw-r--r-- | arch/arm/mach-msm/clock-pcom.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-msm/clock.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-msm/clock.h | 3 | ||||
| -rw-r--r-- | arch/arm/mach-msm/devices-msm7x00.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-msm/devices-msm7x30.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-msm/devices-qsd8x50.c | 1 |
6 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-msm/clock-pcom.c b/arch/arm/mach-msm/clock-pcom.c index a3b45627eb4..8c4e8672501 100644 --- a/arch/arm/mach-msm/clock-pcom.c +++ b/arch/arm/mach-msm/clock-pcom.c @@ -20,6 +20,7 @@ #include "proc_comm.h" #include "clock.h" +#include "clock-pcom.h" /* * glue for the proc_comm interface diff --git a/arch/arm/mach-msm/clock.c b/arch/arm/mach-msm/clock.c index b67498dfa8d..8f71f8d9fa9 100644 --- a/arch/arm/mach-msm/clock.c +++ b/arch/arm/mach-msm/clock.c @@ -29,6 +29,7 @@ #include "clock.h" #include "proc_comm.h" #include "clock-7x30.h" +#include "clock-pcom.h" static DEFINE_MUTEX(clocks_mutex); static DEFINE_SPINLOCK(clocks_lock); diff --git a/arch/arm/mach-msm/clock.h b/arch/arm/mach-msm/clock.h index db9a77a0f9e..6a0cadeabb9 100644 --- a/arch/arm/mach-msm/clock.h +++ b/arch/arm/mach-msm/clock.h @@ -20,9 +20,6 @@ #include <linux/list.h> #include <mach/clk.h> -#include "clock-pcom.h" -#include "clock-7x30.h" - #define CLKFLAG_INVERT 0x00000001 #define CLKFLAG_NOINVERT 0x00000002 #define CLKFLAG_NONEST 0x00000004 diff --git a/arch/arm/mach-msm/devices-msm7x00.c b/arch/arm/mach-msm/devices-msm7x00.c index fb548a8a21d..0a47678143f 100644 --- a/arch/arm/mach-msm/devices-msm7x00.c +++ b/arch/arm/mach-msm/devices-msm7x00.c @@ -26,6 +26,7 @@ #include "clock.h" +#include "clock-pcom.h" #include <mach/mmc.h> static struct resource resources_uart1[] = { diff --git a/arch/arm/mach-msm/devices-msm7x30.c b/arch/arm/mach-msm/devices-msm7x30.c index 4e9a0ab3e93..5dc64afd9ae 100644 --- a/arch/arm/mach-msm/devices-msm7x30.c +++ b/arch/arm/mach-msm/devices-msm7x30.c @@ -28,6 +28,7 @@ #include <asm/mach/flash.h> #include "clock-pcom.h" +#include "clock-7x30.h" #include <mach/mmc.h> diff --git a/arch/arm/mach-msm/devices-qsd8x50.c b/arch/arm/mach-msm/devices-qsd8x50.c index a4b798f20cc..c08e48e65f0 100644 --- a/arch/arm/mach-msm/devices-qsd8x50.c +++ b/arch/arm/mach-msm/devices-qsd8x50.c @@ -27,6 +27,7 @@ #include <asm/mach/flash.h> #include <mach/mmc.h> +#include "clock-pcom.h" static struct resource resources_uart3[] = { { |