diff options
author | David S. Miller <davem@davemloft.net> | 2017-05-22 23:32:48 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-05-22 23:32:48 -0400 |
commit | 218b6a5b23e939caf2064549b1cb61ba22b9d0a1 (patch) | |
tree | bdabf5439fb58905268953165779614d2aadb677 /drivers/memory/omap-gpmc.c | |
parent | 1db3a61017c627d590315347ccf302d9a6b97970 (diff) | |
parent | fadd2ce5a3680fb265694f573cbfb8bcb7d6c9d5 (diff) | |
download | op-kernel-dev-218b6a5b23e939caf2064549b1cb61ba22b9d0a1.zip op-kernel-dev-218b6a5b23e939caf2064549b1cb61ba22b9d0a1.tar.gz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/memory/omap-gpmc.c')
-rw-r--r-- | drivers/memory/omap-gpmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c index bf0fe01..6d1b4b7 100644 --- a/drivers/memory/omap-gpmc.c +++ b/drivers/memory/omap-gpmc.c @@ -512,7 +512,7 @@ static void gpmc_cs_show_timings(int cs, const char *desc) pr_info("gpmc cs%i access configuration:\n", cs); GPMC_GET_RAW_BOOL(GPMC_CS_CONFIG1, 4, 4, "time-para-granularity"); GPMC_GET_RAW(GPMC_CS_CONFIG1, 8, 9, "mux-add-data"); - GPMC_GET_RAW_MAX(GPMC_CS_CONFIG1, 12, 13, + GPMC_GET_RAW_SHIFT_MAX(GPMC_CS_CONFIG1, 12, 13, 1, GPMC_CONFIG1_DEVICESIZE_MAX, "device-width"); GPMC_GET_RAW(GPMC_CS_CONFIG1, 16, 17, "wait-pin"); GPMC_GET_RAW_BOOL(GPMC_CS_CONFIG1, 21, 21, "wait-on-write"); |