Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / include / asm-m68k / amigahw.h

diff --git a/include/asm-m68k/amigahw.h b/include/asm-m68k/amigahw.h
index 045f58f..a16fe4e 100644 (file)
--- a/include/asm-m68k/amigahw.h
+++ b/include/asm-m68k/amigahw.h
@@ -252,8 +252,8 @@ struct CUSTOM {
 #define DMAF_ALL               (0x01FF)
 
 struct CIA {
-    unsigned char pra;                 char pad0[0xff];
-    unsigned char prb;                 char pad1[0xff];
+    unsigned char pra;         char pad0[0xff];
+    unsigned char prb;         char pad1[0xff];
     unsigned char ddra;                char pad2[0xff];
     unsigned char ddrb;                char pad3[0xff];
     unsigned char talo;                char pad4[0xff];
@@ -263,10 +263,10 @@ struct CIA {
     unsigned char todlo;       char pad8[0xff];
     unsigned char todmid;      char pad9[0xff];
     unsigned char todhi;       char pada[0x1ff];
-    unsigned char sdr;                 char padb[0xff];
-    unsigned char icr;                 char padc[0xff];
-    unsigned char cra;                 char padd[0xff];
-    unsigned char crb;                 char pade[0xff];
+    unsigned char sdr;         char padb[0xff];
+    unsigned char icr;         char padc[0xff];
+    unsigned char cra;         char padd[0xff];
+    unsigned char crb;         char pade[0xff];
 };
 
 #define zTwoBase (0x80000000)
@@ -274,7 +274,7 @@ struct CIA {
 #define ZTWO_VADDR(x) (((unsigned long)(x))+zTwoBase)
 
 #define CUSTOM_PHYSADDR     (0xdff000)
-#define custom ((*(volatile struct CUSTOM *)(zTwoBase+CUSTOM_PHYSADDR)))
+#define amiga_custom ((*(volatile struct CUSTOM *)(zTwoBase+CUSTOM_PHYSADDR)))
 
 #define CIAA_PHYSADDR    (0xbfe001)
 #define CIAB_PHYSADDR    (0xbfd000)
@@ -294,12 +294,12 @@ static inline void amifb_video_off(void)
 {
        if (amiga_chipset == CS_ECS || amiga_chipset == CS_AGA) {
                /* program Denise/Lisa for a higher maximum play rate */
-               custom.htotal = 113;        /* 31 kHz */
-               custom.vtotal = 223;        /* 70 Hz */
-               custom.beamcon0 = 0x4390;   /* HARDDIS, VAR{BEAM,VSY,HSY,CSY}EN */
+               amiga_custom.htotal = 113;        /* 31 kHz */
+               amiga_custom.vtotal = 223;        /* 70 Hz */
+               amiga_custom.beamcon0 = 0x4390;   /* HARDDIS, VAR{BEAM,VSY,HSY,CSY}EN */
                /* suspend the monitor */
-               custom.hsstrt = custom.hsstop = 116;
-               custom.vsstrt = custom.vsstop = 226;
+               amiga_custom.hsstrt = amiga_custom.hsstop = 116;
+               amiga_custom.vsstrt = amiga_custom.vsstop = 226;
                amiga_audio_min_period = 57;
        }
 }
@@ -319,7 +319,7 @@ struct tod3000 {
   unsigned int  :28, year2:4;  /* lower digit */
   unsigned int  :28, year1:4;  /* upper digit */
   unsigned int  :28, cntrl1:4; /* control-byte 1 */
-  unsigned int  :28, cntrl2:4; /* control-byte 2 */  
+  unsigned int  :28, cntrl2:4; /* control-byte 2 */
   unsigned int  :28, cntrl3:4; /* control-byte 3 */
 };
 #define TOD3000_CNTRL1_HOLD    0
@@ -341,7 +341,7 @@ struct tod2000 {
   unsigned int  :28, year1:4;  /* upper digit */
   unsigned int  :28, weekday:4;
   unsigned int  :28, cntrl1:4; /* control-byte 1 */
-  unsigned int  :28, cntrl2:4; /* control-byte 2 */  
+  unsigned int  :28, cntrl2:4; /* control-byte 2 */
   unsigned int  :28, cntrl3:4; /* control-byte 3 */
 };