summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-msm/acpuclock-arm11.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-12 10:07:32 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-12 10:07:32 -0700
commitce4327d372af7e2f2d403286e9904ab012e72827 (patch)
treeaa95c33aa9277d3ecb4d7c46cee13c8b59611c7c /arch/arm/mach-msm/acpuclock-arm11.c
parent4032816dca04141e3d49ec4ed717c9f7cc5444c5 (diff)
parentb5d643de3ea28d7844a3a1a00a0a6f50897a2a6b (diff)
downloadblackbird-obmc-linux-ce4327d372af7e2f2d403286e9904ab012e72827.tar.gz
blackbird-obmc-linux-ce4327d372af7e2f2d403286e9904ab012e72827.zip
Merge branch 'msm-core' of git://codeaurora.org/quic/kernel/dwalker/linux-msm
* 'msm-core' of git://codeaurora.org/quic/kernel/dwalker/linux-msm: msm: mmc: Add msm prefix to platform data structure msm: trout: Remove extern declaration from source file arm: msm: Fix section mismatch in smd.c. arm: msm: trout add mmc support arm: msm: trout: add trout specific gpio interrupts arm: msm: remove unused #include <linux/version.h>
Diffstat (limited to 'arch/arm/mach-msm/acpuclock-arm11.c')
-rw-r--r--arch/arm/mach-msm/acpuclock-arm11.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/acpuclock-arm11.c b/arch/arm/mach-msm/acpuclock-arm11.c
index f060a3959a75..7ffbd987eb5d 100644
--- a/arch/arm/mach-msm/acpuclock-arm11.c
+++ b/arch/arm/mach-msm/acpuclock-arm11.c
@@ -17,7 +17,6 @@
*
*/
-#include <linux/version.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/list.h>
OpenPOWER on IntegriCloud