From: Linus Torvalds <torvalds@linux-foundation.org> Date: Tue, 10 Jun 2014 21:35:22 +0000 (-0700) Subject: Merge tag 'mmc-updates-for-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: firefly_0821_release~176^2~3794 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=07888238f55056605cd23aa4ea3ca97d5e15938f;p=firefly-linux-kernel-4.4.55.git Merge tag 'mmc-updates-for-3.16-rc1' of git://git./linux/kernel/git/cjb/mmc Pull MMC update from Chris Ball: "MMC highlights for 3.16: Core: - support HS400 mode of eMMC 5.0, via DT bindings mmc-hs400-1_{2,8}v - if card init at 3.3v doesn't work, try 1.8v and 1.2v too Drivers: - moxart: New driver for MOXA ART SoCs - rtsx_usb_sdmmc: New driver for Realtek USB card readers - sdhci: Large rework around IRQ/regulator handling, remove card_tasklet - sdhci-pci-o2micro: Add SeaBird SeaEagle SD3 support - sunxi: New driver for Allwinner sunxi SoCs - usdhi6rol0: New driver for Renesas SD/SDIO controller" * tag 'mmc-updates-for-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (95 commits) mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet mmc: add a driver for the Renesas usdhi6rol0 SD/SDIO host controller mmc: sdhci-of-esdhc: Fixup compile error mmc: tegra: fix reporting of base clock frequency mmc: tegra: disable UHS modes mmc: sdhci-dove: use mmc_of_parse() and remove card_tasklet CD handler MAINTAINERS: mmc: Add path to git tree mmc: dove: fix missing MACH_DOVE dependency mmc: sdhci: SD tuning is broken for some controllers mmc: sdhci-esdhc-imx: fix mmc ddr mode regression issue mmc: sdhci-pci-o2micro: Add SeaBird SeaEagle SD3 support mmc: omap_hsmmc: split omap-dma header file mmc: omap_hsmmc: fix cmd23 multiblock read/write mmc: omap_hsmmc: use devm_ioremap_resource mmc: omap_hsmmc: use devm_request_threaded_irq mmc: omap_hsmmc: use devm_request_irq mmc: omap_hsmmc: use devm_clk_get mmc: sunxi: Add driver for SD/MMC hosts found on Allwinner sunxi SoCs mmc: wmt-sdmmc: Use GFP_KERNEL instead of hard-coded value mmc: omap: Use DIV_ROUND_UP instead of open coded ... --- 07888238f55056605cd23aa4ea3ca97d5e15938f diff --cc include/linux/omap-dmaengine.h index 000000000000,2b0b6aa01922..8e6906c72e90 mode 000000,100644..100644 --- a/include/linux/omap-dmaengine.h +++ b/include/linux/omap-dmaengine.h @@@ -1,0 -1,21 +1,21 @@@ + /* + * OMAP DMA Engine support + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + #ifndef __LINUX_OMAP_DMAENGINE_H + #define __LINUX_OMAP_DMAENGINE_H + + struct dma_chan; + -#if defined(CONFIG_DMA_OMAP) || defined(CONFIG_DMA_OMAP_MODULE) ++#if defined(CONFIG_DMA_OMAP) || (defined(CONFIG_DMA_OMAP_MODULE) && defined(MODULE)) + bool omap_dma_filter_fn(struct dma_chan *, void *); + #else + static inline bool omap_dma_filter_fn(struct dma_chan *c, void *d) + { + return false; + } + #endif + #endif /* __LINUX_OMAP_DMAENGINE_H */