mirror of
https://github.com/torvalds/linux.git
synced 2024-11-24 21:21:41 +00:00
Merge branch 'fixes' into next
This commit is contained in:
commit
907a231705
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user