mmc: depend on !HIGHMEM for not highmem capable drivers

Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/mmc/core/Kconfig b/drivers/mmc/core/Kconfig
index 6f25c34e4fecbf26d69b13c2c8c2ffbbc0013615..0cf445104b199e136fbff54c54ab06814c422f41 100644 (file)
--- a/drivers/mmc/core/Kconfig
+++ b/drivers/mmc/core/Kconfig
@@ -71,6 +71,7 @@ config SDIO_UART
 
 config MMC_TEST
        tristate "MMC host test driver"
+       depends on !HIGHMEM
        help
          Development driver that performs a series of reads and writes
          to a memory card in order to expose certain well known bugs

diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c
index b396e39007177cc3ac22c7a783bd6e3bf46159bc..f38e9f6f45030991ba2e341fe33f415c1c8b84aa 100644 (file)
--- a/drivers/mmc/core/queue.c
+++ b/drivers/mmc/core/queue.c
@@ -355,8 +355,6 @@ static void mmc_setup_queue(struct mmc_queue *mq, struct mmc_card *card)
        if (mmc_can_erase(card))
                mmc_queue_setup_discard(mq->queue, card);
 
-       if (!mmc_dev(host)->dma_mask || !*mmc_dev(host)->dma_mask)
-               blk_queue_bounce_limit(mq->queue, BLK_BOUNCE_HIGH);
        blk_queue_max_hw_sectors(mq->queue,
                min(host->max_blk_count, host->max_req_size / 512));
        if (host->can_dma_map_merge)

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 5e19a961c34d7b5664ab2fd43cfba82dc90913ac..11e1144bb91a5ee70791fe3c29212b993aaebaba 100644 (file)
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -277,6 +277,7 @@ config MMC_SDHCI_ESDHC_MCF
        tristate "SDHCI support for the Freescale eSDHC ColdFire controller"
        depends on M5441x
        depends on MMC_SDHCI_PLTFM
+       depends on !HIGHMEM
        select MMC_SDHCI_IO_ACCESSORS
        help
          This selects the Freescale eSDHC controller support for
@@ -479,6 +480,7 @@ config MMC_MESON_MX_SDIO
 config MMC_MOXART
        tristate "MOXART SD/MMC Host Controller support"
        depends on ARCH_MOXART || COMPILE_TEST
+       depends on !HIGHMEM
        help
          This selects support for the MOXART SD/MMC Host Controller.
          MOXA provides one multi-functional card reader which can
@@ -501,6 +503,7 @@ config MMC_OMAP
        tristate "TI OMAP Multimedia Card Interface support"
        depends on ARCH_OMAP
        depends on TPS65010 || !MACH_OMAP_H2
+       depends on !HIGHMEM
        help
          This selects the TI OMAP Multimedia card Interface.
          If you have an OMAP board with a Multimedia Card slot,
@@ -574,6 +577,7 @@ config MMC_SDHCI_MSM
 config MMC_MXC
        tristate "Freescale i.MX21/27/31 or MPC512x Multimedia Card support"
        depends on ARCH_MXC || PPC_MPC512x
+       depends on !HIGHMEM
        help
          This selects the Freescale i.MX21, i.MX27, i.MX31 or MPC512x
          Multimedia Card Interface. If you have an i.MX or MPC512x platform
@@ -610,6 +614,7 @@ config MMC_MVSDIO
        tristate "Marvell MMC/SD/SDIO host driver"
        depends on PLAT_ORION || (COMPILE_TEST && ARM)
        depends on OF
+       depends on !HIGHMEM
        help
          This selects the Marvell SDIO host driver.
          SDIO may currently be found on the Kirkwood 88F6281 and 88F6192
@@ -621,6 +626,7 @@ config MMC_MVSDIO
 config MMC_DAVINCI
        tristate "TI DAVINCI Multimedia Card Interface support"
        depends on ARCH_DAVINCI || COMPILE_TEST
+       depends on !HIGHMEM
        help
          This selects the TI DAVINCI Multimedia card Interface.
          If you have an DAVINCI board with a Multimedia Card slot,
@@ -644,6 +650,7 @@ config MMC_S3C
        tristate "Samsung S3C SD/MMC Card Interface support"
        depends on ARCH_S3C24XX || COMPILE_TEST
        depends on S3C24XX_DMAC || COMPILE_TEST
+       depends on !HIGHMEM
        help
          This selects a driver for the MCI interface found in
          Samsung's S3C2410, S3C2412, S3C2440, S3C2442 CPUs.