Various compilation fixes.

[mcf548x/linux.git] / arch / m68k / coldfire / config.c

diff --git a/arch/m68k/coldfire/config.c b/arch/m68k/coldfire/config.c
index 23be9d43586514d2778b682f023a8981235ca09c..4f5f9edf9aca5732748515d5f0ba5c5f301040b7 100644 (file)
--- a/arch/m68k/coldfire/config.c
+++ b/arch/m68k/coldfire/config.c
@@ -55,7 +55,7 @@ extern char _etext, _edata, __init_begin, __init_end;
 extern struct console mcfrs_console;
 extern unsigned long availmem;
 
-#if CONFIG_UBOOT
+#ifdef CONFIG_UBOOT
 extern char m68k_command_line[CL_SIZE];
 struct mem_info m68k_ramdisk;
 #endif
@@ -380,7 +380,7 @@ void coldfire_reboot(void)
 
 static void coldfire_get_model(char *model)
 {
-       sprintf(model, "Version 4 ColdFire");
+       sprintf(model, "Version 4e ColdFire");
 }
 
 static void __init
@@ -462,7 +462,7 @@ void __init config_coldfire(void)
 }
 
 //no special boot record
-int coldfire_parse_bootinfo(const struct bi_record *)
+int coldfire_parse_bootinfo(const struct bi_record * record)
 {
        return 1;
 }