diff options
| author | David Brown <davidb@codeaurora.org> | 2011-01-28 14:31:53 -0500 |
|---|---|---|
| committer | David Brown <davidb@codeaurora.org> | 2011-01-28 14:31:53 -0500 |
| commit | ecca8194c16bdf6cde99a2b29c23a77901cd61a6 (patch) | |
| tree | 80b533b480b94b1bdc4dad3b0d300868f44cde04 /arch/arm/mach-msm/io.c | |
| parent | d1f4cec78ee3141a78b2b35969f5bebf7ea9b208 (diff) | |
| parent | 07a3cc4814f790354d4c7be2c9dc6143a714a07a (diff) | |
Merge branch 'msm-core' into for-next
* msm-core:
msm: Clean up useless ifdefs
msm: clock: Add support for more proc_comm clocks
msm: clock: Invert debugfs directory layout
msm: clock: Move debugfs code from clock.c to clock-debug.c
msm: clock: Remove 7x30 and pcom includes from clock.h
msm: clock: Remove unused code and definitions
msm: Warning fix in trout gpio board file
msm: Remove broken register definition from trout
Diffstat (limited to 'arch/arm/mach-msm/io.c')
| -rw-r--r-- | arch/arm/mach-msm/io.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c index d8d9be5d821b..cec6ed1c91d3 100644 --- a/arch/arm/mach-msm/io.c +++ b/arch/arm/mach-msm/io.c | |||
| @@ -42,7 +42,6 @@ | |||
| 42 | static struct map_desc msm_io_desc[] __initdata = { | 42 | static struct map_desc msm_io_desc[] __initdata = { |
| 43 | MSM_DEVICE(VIC), | 43 | MSM_DEVICE(VIC), |
| 44 | MSM_CHIP_DEVICE(CSR, MSM7X00), | 44 | MSM_CHIP_DEVICE(CSR, MSM7X00), |
| 45 | MSM_DEVICE(GPT), | ||
| 46 | MSM_DEVICE(DMOV), | 45 | MSM_DEVICE(DMOV), |
| 47 | MSM_DEVICE(GPIO1), | 46 | MSM_DEVICE(GPIO1), |
| 48 | MSM_DEVICE(GPIO2), | 47 | MSM_DEVICE(GPIO2), |