[PATCH] M68k update (part 26)

Misc Mac/m68k updates
 - Make sure we have one instance of mac_hw_present
 - Kill warning
 - Rename struct SCC to struct mac_SCC to avoid type conflict

diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
index 0d5eca42e35eabd4eb81e2a4461832bca019fe24..8c35bfc391e9ffa5dfc6efc911ad29a298ffaf89 100644 (file)
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
@@ -47,6 +47,8 @@
 struct mac_booter_data mac_bi_data = {0,};
 int mac_bisize = sizeof mac_bi_data;
 
+struct mac_hw_present mac_hw_present;
+
 /* New m68k bootinfo stuff and videobase */
 
 extern int m68k_num_memory;

diff --git a/arch/m68k/mac/debug.c b/arch/m68k/mac/debug.c
index c29b02207853a3c1c55755dafd9897539c81cf12..a3c630d14d6ba2a51cc4902ba950cd724bf186a0 100644 (file)
--- a/arch/m68k/mac/debug.c
+++ b/arch/m68k/mac/debug.c
@@ -36,7 +36,7 @@ extern unsigned long mac_videobase;
 extern unsigned long mac_videodepth;
 extern unsigned long mac_rowbytes;
 
-extern void mac_serial_print(char *);
+extern void mac_serial_print(const char *);
 
 #define DEBUG_HEADS
 #undef DEBUG_SCREEN
@@ -137,7 +137,7 @@ void mac_debugging_long(int pos, long addr)
  * TODO: serial debug code
  */
 
-struct SCC
+struct mac_SCC
  {
   u_char cha_b_ctrl;
   u_char char_dummy1;
@@ -148,7 +148,7 @@ struct SCC
   u_char cha_a_data;
  };
 
-# define scc (*((volatile struct SCC*)mac_bi_data.sccbase))
+# define scc (*((volatile struct mac_SCC*)mac_bi_data.sccbase))
 
 /* Flag that serial port is already initialized and used */
 int mac_SCC_init_done = 0;

diff --git a/include/asm-m68k/machw.h b/include/asm-m68k/machw.h
index e846418408a84dcd40eb984a7344fc1b550c3ad9..120195037c9a0ab5df3c55792253677c634accb1 100644 (file)
--- a/include/asm-m68k/machw.h
+++ b/include/asm-m68k/machw.h
@@ -68,11 +68,11 @@ struct MAC_SCC
 
 /* hardware stuff */
 
-#define MACHW_DECLARE(name)    unsigned name : 1
-#define MACHW_SET(name)                (mac_hw_present.name = 1)
-#define MACHW_PRESENT(name)    (mac_hw_present.name)
+#define MACHW_DECLARE(name)    unsigned name : 1
+#define MACHW_SET(name)                (mac_hw_present.name = 1)
+#define MACHW_PRESENT(name)    (mac_hw_present.name)
 
-struct {
+struct mac_hw_present {
   /* video hardware */
   /* sound hardware */
   /* disk storage interfaces */
@@ -92,9 +92,9 @@ struct {
   MACHW_DECLARE(RBV);             /* Versatile Interface Ad. 2+ */
   /* NUBUS */
   MACHW_DECLARE(NUBUS);           /* NUBUS */
-} mac_hw_present;
+};
 
-/* extern struct mac_hw_present mac_hw_present; */
+extern struct mac_hw_present mac_hw_present;
 
 #endif /* __ASSEMBLY__ */