Commit 9aad9c0d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'msm-urgent' of git://codeaurora.org/quic/kernel/dwalker/linux-msm:
  mmc: msm: fix compile error on MSM7x30
  msm: dma: add completion.h header
parents e411f2dd f3d56144

arch/arm/mach-msm/dma.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/err.h>

#include <linux/io.h>

#include <linux/interrupt.h>

#include <linux/completion.h>

#include <mach/dma.h>



#define MSM_DMOV_CHANNEL_COUNT 16

drivers/mmc/host/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ config MMC_IMX 


config MMC_MSM7X00A

	tristate "Qualcomm MSM 7X00A SDCC Controller Support"

	depends on MMC && ARCH_MSM

	depends on MMC && ARCH_MSM && !ARCH_MSM7X30

	help

	  This provides support for the SD/MMC cell found in the

          MSM 7X00A controllers from Qualcomm.