diff options
Diffstat (limited to 'arch/m68k/68000')
| -rw-r--r-- | arch/m68k/68000/dragen2.c | 1 | ||||
| -rw-r--r-- | arch/m68k/68000/screen.h | 2 | ||||
| -rw-r--r-- | arch/m68k/68000/ucsimm.c | 9 |
3 files changed, 7 insertions, 5 deletions
diff --git a/arch/m68k/68000/dragen2.c b/arch/m68k/68000/dragen2.c index 62f10a9e1ab7..1a57eff28cfe 100644 --- a/arch/m68k/68000/dragen2.c +++ b/arch/m68k/68000/dragen2.c @@ -11,6 +11,7 @@ #include <linux/init.h> #include <asm/machdep.h> #include <asm/MC68VZ328.h> +#include "m68328.h" #include "screen.h" /***************************************************************************/ diff --git a/arch/m68k/68000/screen.h b/arch/m68k/68000/screen.h index 2089bdf02688..8f7418008908 100644 --- a/arch/m68k/68000/screen.h +++ b/arch/m68k/68000/screen.h @@ -1,4 +1,5 @@ /* Created with The GIMP */ +#ifdef CONFIG_INIT_LCD #define screen_width 320 #define screen_height 240 static unsigned char screen_bits[] = { @@ -802,3 +803,4 @@ static unsigned char screen_bits[] = { 0x93, 0x10, 0xe2, 0x11, 0x00, 0x94, 0x22, 0x52, 0x69, 0x53, 0x52, 0x45, 0x49, 0x22, 0xa4, 0x4a, 0x55, 0x29, 0x2a, 0xa4, 0x52, 0x42, 0xaa, 0xa5, 0x52, 0xa8, 0xaa, 0x55, 0x4a, 0xab, 0xa9, 0x4a, 0x54, 0x49, 0x32, 0x24 }; +#endif /* CONFIG_INIT_LCD */ diff --git a/arch/m68k/68000/ucsimm.c b/arch/m68k/68000/ucsimm.c index 7c6cbf643712..c54fde75eae8 100644 --- a/arch/m68k/68000/ucsimm.c +++ b/arch/m68k/68000/ucsimm.c @@ -16,19 +16,18 @@ #include "m68328.h" -unsigned char *cs8900a_hwaddr; static int errno; -_bsc0(char *, getserialnum) -_bsc1(unsigned char *, gethwaddr, int, a) -_bsc1(char *, getbenv, char *, a) +static _bsc0(char *, getserialnum) +static _bsc1(unsigned char *, gethwaddr, int, a) +static _bsc1(char *, getbenv, char *, a) void __init init_ucsimm(char *command, int size) { char *p; pr_info("uCsimm/uCdimm serial string [%s]\n", getserialnum()); - p = cs8900a_hwaddr = gethwaddr(0); + p = gethwaddr(0); pr_info("uCsimm/uCdimm hwaddr %pM\n", p); p = getbenv("APPEND"); if (p) |