projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v4.4/topic/ro-vdso' into linux-linaro-lsk-v4.4
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
mmc
/
dw_mmc.h
diff --git
a/include/linux/mmc/dw_mmc.h
b/include/linux/mmc/dw_mmc.h
index f67b2ec18e6d87c8df27b314f7320e49163850f5..7776afb0ffa5833bc784d32317cece83f1ea2cbd 100644
(file)
--- a/
include/linux/mmc/dw_mmc.h
+++ b/
include/linux/mmc/dw_mmc.h
@@
-172,7
+172,7
@@
struct dw_mci {
/* For edmac */
struct dw_mci_dma_slave *dms;
/* Registers's physical base address */
/* For edmac */
struct dw_mci_dma_slave *dms;
/* Registers's physical base address */
-
void *
phy_regs;
+
resource_size_t
phy_regs;
u32 cmd_status;
u32 data_status;
u32 cmd_status;
u32 data_status;