diff options
| author | Mark Brown <[email protected]> | 2015-10-12 18:09:27 +0100 | 
|---|---|---|
| committer | Mark Brown <[email protected]> | 2015-10-12 18:09:27 +0100 | 
| commit | 79828b4fa835f73cdaf4bffa48696abdcbea9d02 (patch) | |
| tree | 5e0fa7156acb75ba603022bc807df8f2fedb97a8 /drivers/mmc/host/android-goldfish.c | |
| parent | 721b51fcf91898299d96f4b72cb9434cda29dce6 (diff) | |
| parent | 8c1a9d6323abf0fb1e5dad96cf3f1c783505ea5a (diff) | |
Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-fix-rt5645
Diffstat (limited to 'drivers/mmc/host/android-goldfish.c')
| -rw-r--r-- | drivers/mmc/host/android-goldfish.c | 2 | 
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/android-goldfish.c b/drivers/mmc/host/android-goldfish.c index b1eac719a4cc..dca5518b0139 100644 --- a/drivers/mmc/host/android-goldfish.c +++ b/drivers/mmc/host/android-goldfish.c @@ -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;  |