AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

Merge branch 'msm-urgent' of git://codeaurora.org/quic/kernel/dwalker/linux-msm

Browse Source 
* 'msm-urgent' of git://codeaurora.org/quic/kernel/dwalker/linux-msm:
  mmc: msm: fix compile error on MSM7x30
  msm: dma: add completion.h header
This commit is contained in:
Linus Torvalds 2010-06-09 09:45:46 -07:00
commit 9aad9c0d93
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-msm/dma.c
View File

@ -17,6 +17,7 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/completion.h>
#include <mach/dma.h> #include <mach/dma.h>
#define MSM_DMOV_CHANNEL_COUNT 16 #define MSM_DMOV_CHANNEL_COUNT 16

2
drivers/mmc/host/Kconfig
View File

@ -249,7 +249,7 @@ config MMC_IMX
config MMC_MSM7X00A config MMC_MSM7X00A
tristate "Qualcomm MSM 7X00A SDCC Controller Support" tristate "Qualcomm MSM 7X00A SDCC Controller Support"
depends on MMC && ARCH_MSM depends on MMC && ARCH_MSM && !ARCH_MSM7X30
help help
This provides support for the SD/MMC cell found in the This provides support for the SD/MMC cell found in the
MSM 7X00A controllers from Qualcomm. MSM 7X00A controllers from Qualcomm.