tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 9aad9c0d e411f2dd

+2 -1
+1
arch/arm/mach-msm/dma.c
··· 17 17 #include <linux/err.h> 18 18 #include <linux/io.h> 19 19 #include <linux/interrupt.h> 20 + #include <linux/completion.h> 20 21 #include <mach/dma.h> 21 22 22 23 #define MSM_DMOV_CHANNEL_COUNT 16
+1 -1
drivers/mmc/host/Kconfig
··· 249 249 250 250 config MMC_MSM7X00A 251 251 tristate "Qualcomm MSM 7X00A SDCC Controller Support" 252 - depends on MMC && ARCH_MSM 252 + depends on MMC && ARCH_MSM && !ARCH_MSM7X30 253 253 help 254 254 This provides support for the SD/MMC cell found in the 255 255 MSM 7X00A controllers from Qualcomm.