aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-msm
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2011-01-26 19:20:53 -0500
committerDavid Brown <davidb@codeaurora.org>2011-01-28 14:20:47 -0500
commitce1c80fbaa3b8e132d4e430cbf7cb4a9cd28b2d5 (patch)
tree6f9b5cd08bafc6f62ffe0c23c4a0b1a3297c29ba /arch/arm/mach-msm
parent437f629d4ea0a574b6102101fe4a51232a7cc105 (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>
Diffstat (limited to 'arch/arm/mach-msm')
-rw-r--r--arch/arm/mach-msm/clock-pcom.c1
-rw-r--r--arch/arm/mach-msm/clock.c1
-rw-r--r--arch/arm/mach-msm/clock.h3
-rw-r--r--arch/arm/mach-msm/devices-msm7x00.c1
-rw-r--r--arch/arm/mach-msm/devices-msm7x30.c1
-rw-r--r--arch/arm/mach-msm/devices-qsd8x50.c1
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 @@
20 20
21#include "proc_comm.h" 21#include "proc_comm.h"
22#include "clock.h" 22#include "clock.h"
23#include "clock-pcom.h"
23 24
24/* 25/*
25 * glue for the proc_comm interface 26 * 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 @@
29#include "clock.h" 29#include "clock.h"
30#include "proc_comm.h" 30#include "proc_comm.h"
31#include "clock-7x30.h" 31#include "clock-7x30.h"
32#include "clock-pcom.h"
32 33
33static DEFINE_MUTEX(clocks_mutex); 34static DEFINE_MUTEX(clocks_mutex);
34static DEFINE_SPINLOCK(clocks_lock); 35static 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 @@
20#include <linux/list.h> 20#include <linux/list.h>
21#include <mach/clk.h> 21#include <mach/clk.h>
22 22
23#include "clock-pcom.h"
24#include "clock-7x30.h"
25
26#define CLKFLAG_INVERT 0x00000001 23#define CLKFLAG_INVERT 0x00000001
27#define CLKFLAG_NOINVERT 0x00000002 24#define CLKFLAG_NOINVERT 0x00000002
28#define CLKFLAG_NONEST 0x00000004 25#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 @@
26 26
27 27
28#include "clock.h" 28#include "clock.h"
29#include "clock-pcom.h"
29#include <mach/mmc.h> 30#include <mach/mmc.h>
30 31
31static struct resource resources_uart1[] = { 32static 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 @@
28#include <asm/mach/flash.h> 28#include <asm/mach/flash.h>
29 29
30#include "clock-pcom.h" 30#include "clock-pcom.h"
31#include "clock-7x30.h"
31 32
32#include <mach/mmc.h> 33#include <mach/mmc.h>
33 34
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 @@
27#include <asm/mach/flash.h> 27#include <asm/mach/flash.h>
28 28
29#include <mach/mmc.h> 29#include <mach/mmc.h>
30#include "clock-pcom.h"
30 31
31static struct resource resources_uart3[] = { 32static struct resource resources_uart3[] = {
32 { 33 {