These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / mmc / host / android-goldfish.c

diff --git a/kernel/drivers/mmc/host/android-goldfish.c b/kernel/drivers/mmc/host/android-goldfish.c
index 8b4e20a..dca5518 100644 (file)
--- a/kernel/drivers/mmc/host/android-goldfish.c
+++ b/kernel/drivers/mmc/host/android-goldfish.c
@@ -42,10 +42,10 @@
 #include <linux/spinlock.h>
 #include <linux/timer.h>
 #include <linux/clk.h>
+#include <linux/scatterlist.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/scatterlist.h>
 
 #include <asm/types.h>
 #include <asm/io.h>
@@ -118,7 +118,7 @@ struct goldfish_mmc_host {
        struct mmc_host         *mmc;
        struct device           *dev;
        unsigned char           id; /* 16xx chips have 2 MMC blocks */
-       void __iomem            *virt_base;
+       void                    *virt_base;
        unsigned int            phys_base;
        int                     irq;
        unsigned char           bus_mode;