Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'mmc-v4.15-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
Pull MMC host fixes from Ulf Hansson:
- s3mci: mark debug_regs[] as static
- renesas_sdhi: Add MODULE_LICENSE
* tag 'mmc-v4.15-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
mmc: s3mci: mark debug_regs[] as static
mmc: renesas_sdhi: Add MODULE_LICENSE
+7
-2
+3
drivers/mmc/host/renesas_sdhi_core.c
+3
drivers/mmc/host/renesas_sdhi_core.c
···
24
24
#include <linux/kernel.h>
25
25
#include <linux/clk.h>
26
26
#include <linux/slab.h>
27
+
#include <linux/module.h>
27
28
#include <linux/of_device.h>
28
29
#include <linux/platform_device.h>
29
30
#include <linux/mmc/host.h>
···
668
667
return 0;
669
668
}
670
669
EXPORT_SYMBOL_GPL(renesas_sdhi_remove);
670
+
671
+
MODULE_LICENSE("GPL v2");
+4
-2
drivers/mmc/host/s3cmci.c
+4
-2
drivers/mmc/host/s3cmci.c
···
1424
1424
struct s3cmci_reg {
1425
1425
unsigned short addr;
1426
1426
unsigned char *name;
1427
-
} debug_regs[] = {
1427
+
};
1428
+
1429
+
static const struct s3cmci_reg debug_regs[] = {
1428
1430
DBG_REG(CON),
1429
1431
DBG_REG(PRE),
1430
1432
DBG_REG(CMDARG),
···
1448
1446
static int s3cmci_regs_show(struct seq_file *seq, void *v)
1449
1447
{
1450
1448
struct s3cmci_host *host = seq->private;
1451
-
struct s3cmci_reg *rptr = debug_regs;
1449
+
const struct s3cmci_reg *rptr = debug_regs;
1452
1450
1453
1451
for (; rptr->name; rptr++)
1454
1452
seq_printf(seq, "SDI%s\t=0x%08x\n", rptr->name,