diff options
| author | Olof Johansson <olof@lixom.net> | 2013-04-14 20:40:07 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-04-14 20:41:39 -0700 |
| commit | 5ed3ebe3be1aa2afef203c40f11e732f0f343fb9 (patch) | |
| tree | 906cd9ef3675cdfaddf52dcea93a067ac5ab0168 /drivers/mmc | |
| parent | b9d5868e342a9802db7b299be511ac547ff1034d (diff) | |
| parent | 641f71699ec96fb742cc891b9ea4f3a46c60050e (diff) | |
| download | linux-5ed3ebe3be1aa2afef203c40f11e732f0f343fb9.tar.bz2 | |
Merge tag 'msm-cleanup-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into next/cleanup
From David Brown:
Cleanups for MSM for 3.10
These are some patches for various parts of MSM that gradually bring
us closer to being part of single zimage.
* tag 'msm-cleanup-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm:
ARM: msm: Remove unused cpu.h header file
gpio: Make gpio-msm-v1 into a platform driver
mmc: msm_sdcc: Remove unnecessary include
ARM: msm: Move dma.h #defines that are private to dma.c
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/msm_sdcc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c index 7c0af0e80047..0ee4a57fe6b2 100644 --- a/drivers/mmc/host/msm_sdcc.c +++ b/drivers/mmc/host/msm_sdcc.c @@ -43,7 +43,6 @@ #include <asm/sizes.h> #include <linux/platform_data/mmc-msm_sdcc.h> -#include <mach/msm_iomap.h> #include <mach/dma.h> #include <mach/clk.h> |