Merge with 2.3.19.

1 files changed, 2 insertions, 59 deletions

diff --git a/include/asm-m68k/machw.h b/include/asm-m68k/machw.h
index 56da64f3b..e84641840 100644
--- a/include/asm-m68k/machw.h
+++ b/include/asm-m68k/machw.h
@@ -25,6 +25,7 @@
 
 #include <linux/types.h>
 
+#if 0
 /* Mac SCSI Controller 5380 */
 
 #define	MAC_5380_BAS	(0x50F10000) /* This is definitely wrong!! */
@@ -63,65 +64,7 @@ struct MAC_SCC
   u_char cha_b_data;
  };
 # define mac_scc ((*(volatile struct SCC*)MAC_SCC_BAS))
-
-/*
-** VIA 6522
-*/
-
-#define VIA1_BAS	(0x50F00000)
-#define VIA2_BAS	(0x50F02000)
-#define VIA2_BAS_IIci	(0x50F26000)
-struct VIA
- {
-  u_char buf_b;
-  u_char dummy1[0x199];
-  u_char buf_a;
-  u_char dummy2[0x199];
-  u_char dir_b;
-  u_char dummy3[0x199];
-  u_char dir_a;
-  u_char dummy4[0x199];
-  u_char timer1_cl;
-  u_char dummy5[0x199];
-  u_char timer1_ch;
-  u_char dummy6[0x199];
-  u_char timer1_ll;
-  u_char dummy7[0x199];
-  u_char timer1_lh;
-  u_char dummy8[0x199];
-  u_char timer2_cl;
-  u_char dummy9[0x199];
-  u_char timer2_ch;
-  u_char dummy10[0x199];
-  u_char sr;
-  u_char dummy11[0x199];
-  u_char acr;
-  u_char dummy12[0x199];
-  u_char pcr;
-  u_char dummy13[0x199];
-  u_char int_fl;
-  u_char dummy14[0x199];
-  u_char int_en;
-  u_char dummy15[0x199];
-  u_char anr;
-  u_char dummy16[0x199];
- };
-
-# define via_1         ((*(volatile struct VIA *)VIA1_BAS))
-# define via_2         ((*(volatile struct VIA *)VIA2_BAS))
-# define via1_regp     ((volatile unsigned char *)VIA1_BAS)
- 
-/*
- * OSS/RBV base address 
- */
-
-#define OSS_BAS		0x50f1a000
-#define PSC_BAS		0x50f31000
-
-/* move to oss.h?? */
-#define nIFR	0x203
-#define oIFR	0x202
-
+#endif
 
 /* hardware stuff */