diff options
-rw-r--r-- | MAINTAINERS | 6 | ||||
-rw-r--r-- | arch/m68k/68000/m68EZ328.c | 3 | ||||
-rw-r--r-- | arch/m68k/68000/m68VZ328.c | 3 | ||||
-rw-r--r-- | arch/m68k/68360/config.c | 3 |
4 files changed, 8 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2c7e07c99765..329d05a1ebec 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -10389,11 +10389,15 @@ S: Maintained | |||
10389 | F: Documentation/filesystems/ubifs.txt | 10389 | F: Documentation/filesystems/ubifs.txt |
10390 | F: fs/ubifs/ | 10390 | F: fs/ubifs/ |
10391 | 10391 | ||
10392 | UCLINUX (AND M68KNOMMU) | 10392 | UCLINUX (M68KNOMMU AND COLDFIRE) |
10393 | M: Greg Ungerer <gerg@uclinux.org> | 10393 | M: Greg Ungerer <gerg@uclinux.org> |
10394 | W: http://www.uclinux.org/ | 10394 | W: http://www.uclinux.org/ |
10395 | L: linux-m68k@lists.linux-m68k.org | ||
10395 | L: uclinux-dev@uclinux.org (subscribers-only) | 10396 | L: uclinux-dev@uclinux.org (subscribers-only) |
10397 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git | ||
10396 | S: Maintained | 10398 | S: Maintained |
10399 | F: arch/m68k/coldfire/ | ||
10400 | F: arch/m68k/68*/ | ||
10397 | F: arch/m68k/*/*_no.* | 10401 | F: arch/m68k/*/*_no.* |
10398 | F: arch/m68k/include/asm/*_no.* | 10402 | F: arch/m68k/include/asm/*_no.* |
10399 | 10403 | ||
diff --git a/arch/m68k/68000/m68EZ328.c b/arch/m68k/68000/m68EZ328.c index 21952906e9e2..e6ab321f93f8 100644 --- a/arch/m68k/68000/m68EZ328.c +++ b/arch/m68k/68000/m68EZ328.c | |||
@@ -62,8 +62,7 @@ void __init config_BSP(char *command, int len) | |||
62 | #ifdef CONFIG_UCSIMM | 62 | #ifdef CONFIG_UCSIMM |
63 | printk(KERN_INFO "uCsimm serial string [%s]\n",getserialnum()); | 63 | printk(KERN_INFO "uCsimm serial string [%s]\n",getserialnum()); |
64 | p = cs8900a_hwaddr = gethwaddr(0); | 64 | p = cs8900a_hwaddr = gethwaddr(0); |
65 | printk(KERN_INFO "uCsimm hwaddr %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n", | 65 | printk(KERN_INFO "uCsimm hwaddr %pM\n", p); |
66 | p[0], p[1], p[2], p[3], p[4], p[5]); | ||
67 | 66 | ||
68 | p = getbenv("APPEND"); | 67 | p = getbenv("APPEND"); |
69 | if (p) strcpy(p,command); | 68 | if (p) strcpy(p,command); |
diff --git a/arch/m68k/68000/m68VZ328.c b/arch/m68k/68000/m68VZ328.c index 0e5e5a10a021..1154bdb220a0 100644 --- a/arch/m68k/68000/m68VZ328.c +++ b/arch/m68k/68000/m68VZ328.c | |||
@@ -152,8 +152,7 @@ static void __init init_hardware(char *command, int size) | |||
152 | 152 | ||
153 | printk(KERN_INFO "uCdimm serial string [%s]\n", getserialnum()); | 153 | printk(KERN_INFO "uCdimm serial string [%s]\n", getserialnum()); |
154 | p = cs8900a_hwaddr = gethwaddr(0); | 154 | p = cs8900a_hwaddr = gethwaddr(0); |
155 | printk(KERN_INFO "uCdimm hwaddr %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n", | 155 | printk(KERN_INFO "uCdimm hwaddr %pM\n", p); |
156 | p[0], p[1], p[2], p[3], p[4], p[5]); | ||
157 | p = getbenv("APPEND"); | 156 | p = getbenv("APPEND"); |
158 | if (p) | 157 | if (p) |
159 | strcpy(p, command); | 158 | strcpy(p, command); |
diff --git a/arch/m68k/68360/config.c b/arch/m68k/68360/config.c index fd1f948c7129..b65fe4eed38e 100644 --- a/arch/m68k/68360/config.c +++ b/arch/m68k/68360/config.c | |||
@@ -154,8 +154,7 @@ void __init config_BSP(char *command, int len) | |||
154 | #if defined(CONFIG_UCQUICC) && 0 | 154 | #if defined(CONFIG_UCQUICC) && 0 |
155 | printk(KERN_INFO "uCquicc serial string [%s]\n",getserialnum()); | 155 | printk(KERN_INFO "uCquicc serial string [%s]\n",getserialnum()); |
156 | p = scc1_hwaddr = gethwaddr(0); | 156 | p = scc1_hwaddr = gethwaddr(0); |
157 | printk(KERN_INFO "uCquicc hwaddr %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n", | 157 | printk(KERN_INFO "uCquicc hwaddr %pM\n", p); |
158 | p[0], p[1], p[2], p[3], p[4], p[5]); | ||
159 | 158 | ||
160 | p = getbenv("APPEND"); | 159 | p = getbenv("APPEND"); |
161 | if (p) | 160 | if (p) |