diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2018-01-04 12:44:21 +0100 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2018-01-04 12:44:21 +0100 |
| commit | 907a2317051628d2797f59440581cee60b12d6d1 (patch) | |
| tree | 42d7427a25863dc5644488b9351c4e9ba7d4b7a1 /drivers | |
| parent | d63da8c64bbf800a12fe0a4a2804e5953b8cf35e (diff) | |
| parent | 2bd7b4aacdb6efa5ccd4749c365c171b884791d2 (diff) | |
Merge branch 'fixes' into next
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/host/s3cmci.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c index 36daee1e6588..f77493604312 100644 --- a/drivers/mmc/host/s3cmci.c +++ b/drivers/mmc/host/s3cmci.c @@ -1424,7 +1424,9 @@ static const struct file_operations s3cmci_fops_state = { struct s3cmci_reg { unsigned short addr; unsigned char *name; -} debug_regs[] = { +}; + +static const struct s3cmci_reg debug_regs[] = { DBG_REG(CON), DBG_REG(PRE), DBG_REG(CMDARG), @@ -1446,7 +1448,7 @@ struct s3cmci_reg { static int s3cmci_regs_show(struct seq_file *seq, void *v) { struct s3cmci_host *host = seq->private; - struct s3cmci_reg *rptr = debug_regs; + const struct s3cmci_reg *rptr = debug_regs; for (; rptr->name; rptr++) seq_printf(seq, "SDI%s\t=0x%08x\n", rptr->name, |