diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 13:07:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 13:07:32 -0400 |
| commit | ce4327d372af7e2f2d403286e9904ab012e72827 (patch) | |
| tree | aa95c33aa9277d3ecb4d7c46cee13c8b59611c7c /arch/arm/mach-msm/acpuclock-arm11.c | |
| parent | 4032816dca04141e3d49ec4ed717c9f7cc5444c5 (diff) | |
| parent | b5d643de3ea28d7844a3a1a00a0a6f50897a2a6b (diff) | |
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.c | 1 |
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 @@ | |||
| 17 | * | 17 | * |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/version.h> | ||
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 23 | #include <linux/list.h> | 22 | #include <linux/list.h> |