Olof Johansson 823bba8ff1 ARM: tegra: fix mismerges of header file inclusions ...

Another mishandled merge conflict by me, where the header file renames
and the removal of gpio includes clashed and I chose the wrong end result.

Fixes build breakage for tegra_defconfig.

Signed-off-by: Olof Johansson <olof@lixom.net>

2012-10-07 07:02:06 -07:00

..

at91_mci.c

mmc: fix comment typos

2012-09-01 09:52:48 -07:00

at91_mci.h

mmc: at91_mci: move register header from include/ to drivers/

2011-07-21 10:35:08 -04:00

atmel-mci-regs.h

mmc: atmel-mci: fix burst/chunk size modification

2012-06-06 08:52:12 -04:00

atmel-mci.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-10-01 09:06:36 -07:00

au1xmmc.c

MIPS: Alchemy: Au1300 SoC support

2011-12-07 22:02:05 +00:00

bfin_sdh.c

mmc: bfin_sdh: fix dma_desc_array build error

2012-09-04 13:58:04 -04:00

cb710-mmc.c

mmc: convert drivers/mmc/host/* to use module_platform_driver()

2012-01-11 23:58:42 -05:00

cb710-mmc.h

mmc: Driver for CB710/720 memory card reader (MMC part)

2009-06-13 22:42:58 +02:00

davinci_mmc.c

ARM: davinci: move platform_data definitions

2012-09-14 11:16:54 +02:00

dw_mmc-pci.c

mmc: Support of PCI mode in the dw_mmc driver

2012-03-25 19:33:44 -04:00

dw_mmc-pltfm.c

mmc: Support of PCI mode in the dw_mmc driver

2012-03-25 19:33:44 -04:00

dw_mmc.c

mmc: dw_mmc: Disable low power mode if SDIO interrupts are used

2012-09-04 13:58:10 -04:00

dw_mmc.h

mmc: Support of PCI mode in the dw_mmc driver

2012-03-25 19:33:44 -04:00

jz4740_mmc.c

mmc: convert drivers/mmc/host/* to use module_platform_driver()

2012-01-11 23:58:42 -05:00

Kconfig

mmc: at91-mci: this driver is now deprecated

2012-05-17 14:33:48 -04:00

Makefile

mmc: remove imxmmc driver

2012-04-22 11:17:25 -04:00

mmc_spi.c

mmc: Remove redundant spi driver bus initialization

2012-01-11 23:58:42 -05:00

mmci.c

ARM: 7427/1: mmc: mmci: Defer probe() in case of yet uninitialized GPIOs

2012-06-17 22:24:36 +01:00

mmci.h

ARM: 7280/1: mmc: mmci: Cache MMCICLOCK and MMCIPOWER register

2012-02-02 17:02:15 +00:00

msm_sdcc.c

ARM: msm: move platform_data definitions

2012-09-14 11:17:35 +02:00

msm_sdcc.h

mmc: msm_sdcc: Use MCI_INT_MASK0 for PIO interrupts

2011-10-26 15:43:37 -04:00

mvsdio.c

ARM: orion: move platform_data definitions

2012-09-19 17:42:17 +02:00

mvsdio.h

mmc: SDIO driver for Marvell SoCs

2009-03-24 21:30:03 +01:00

mxcmmc.c

ARM: imx: move platform_data definitions

2012-09-14 11:17:21 +02:00

mxs-mmc.c

Linux 3.6-rc6

2012-09-25 13:41:02 +01:00

of_mmc_spi.c

mmc: of_mmc_spi: fix little endian support

2012-02-13 20:38:58 -05:00

omap_hsmmc.c

ARM: soc: general cleanups

2012-10-01 18:19:05 -07:00

omap.c

ARM: OMAP1: Make plat/mux.h omap1 only

2012-09-20 14:54:57 -07:00

pxamci.c

ARM: pxa: move platform_data definitions

2012-09-14 11:18:10 +02:00

pxamci.h

[ARM] pxa: mmc: add 1st host controller support for pxa3xx

2008-01-26 15:07:53 +00:00

s3cmci.c

ARM: samsung: move platform_data definitions

2012-09-19 17:42:18 +02:00

s3cmci.h

s3cmci: DMA fixes

2009-10-01 16:11:15 -07:00

sdhci-cns3xxx.c

mmc: convert drivers/mmc/host/* to use module_platform_driver()

2012-01-11 23:58:42 -05:00

sdhci-dove.c

mmc: sdhci-dove: Prepare for common clock framework

2012-07-22 16:42:48 -04:00

sdhci-esdhc-imx.c

ARM: soc: multiplatform enablement

2012-10-01 19:11:38 -07:00

sdhci-esdhc.h

mmc: sdhci-esdhc: break out early if clock is 0

2012-09-04 13:58:06 -04:00

sdhci-of-esdhc.c

mmc: esdhc: Workaround for data crc error on p1010rdb

2012-03-25 19:33:45 -04:00

sdhci-of-hlwd.c

mmc: convert drivers/mmc/host/* to use module_platform_driver()

2012-01-11 23:58:42 -05:00

sdhci-pci-data.c

mmc: sdhci-pci: add platform data

2012-01-11 23:58:47 -05:00

sdhci-pci.c

sections: fix section conflicts in drivers/mmc

2012-10-06 03:04:42 +09:00

sdhci-pltfm.c

mmc: dt: Consolidate DT bindings

2012-05-15 13:29:42 +02:00

sdhci-pltfm.h

mmc: sdhci: remove "state" argument from sdhci_suspend_host

2011-12-19 15:50:11 -08:00

sdhci-pxav2.c

mmc: sdhci-pxa: Add device tree support

2012-07-21 00:01:47 -04:00

sdhci-pxav3.c

mmc: sdhci-pxa: Add device tree support

2012-07-21 00:01:47 -04:00

sdhci-s3c.c

mmc: sdhci-s3c: pass IRQF ONESHOT to request threaded irq

2012-06-06 09:53:22 -04:00

sdhci-spear.c

Viresh has moved

2012-06-20 14:39:36 -07:00

sdhci-tegra.c

ARM: tegra: fix mismerges of header file inclusions

2012-10-07 07:02:06 -07:00

sdhci.c

mmc: sd: Fix sd current limit setting

2012-07-22 15:25:52 -04:00

sdhci.h

mmc: sdhci: if MAX_CURRENT is 0, try getting current from regulator

2012-07-21 00:02:22 -04:00

sdricoh_cs.c

mmc: Add module.h to drivers/mmc users assuming implicit presence.

2011-10-26 16:32:19 -04:00

sh_mmcif.c

Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

2012-07-24 17:12:54 -07:00

sh_mobile_sdhi.c

Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

2012-07-24 17:12:54 -07:00

tifm_sd.c

Autogenerated GPG tag for Rusty D1ADB8F1: 15EE 8D6C AB0E 7F0C F999 BFCB D920 0E6C D1AD B8F1

2012-01-14 12:32:16 -08:00

tmio_mmc_dma.c

Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

2012-03-29 15:34:57 -07:00

tmio_mmc_pio.c

mmc: tmio: use generic GPIO CD and WP handlers

2012-07-21 00:02:20 -04:00

tmio_mmc.c

mmc: convert drivers/mmc/host/* to use module_platform_driver()

2012-01-11 23:58:42 -05:00

tmio_mmc.h

mmc: tmio_mmc: remove unused sdio_irq_enabled flag

2012-03-27 12:20:17 -04:00

ushc.c

USB: convert some miscellanies drivers to use module_usb_driver()

2011-11-18 09:52:10 -08:00

via-sdmmc.c

mmc: replace printk with appropriate display macro

2011-10-26 16:32:22 -04:00

vub300.c

mmc: fix comment typos

2012-09-01 09:52:48 -07:00

wbsd.c

mmc: replace printk with appropriate display macro

2011-10-26 16:32:22 -04:00

wbsd.h

mmc: update header file paths

2007-07-26 01:53:31 +02:00