patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / arch / m68k / mac / via.c

diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c
index 4954e34..cd528bf 100644 (file)
--- a/arch/m68k/mac/via.c
+++ b/arch/m68k/mac/via.c
@@ -26,10 +26,10 @@
 #include <linux/ide.h>
 
 #include <asm/traps.h>
-#include <asm/bootinfo.h> 
-#include <asm/macintosh.h> 
+#include <asm/bootinfo.h>
+#include <asm/macintosh.h>
 #include <asm/macints.h>
-#include <asm/machw.h> 
+#include <asm/machw.h>
 #include <asm/mac_via.h>
 #include <asm/mac_psc.h>
 
@@ -93,7 +93,7 @@ void __init via_init(void)
 
                /* IIci, IIsi, IIvx, IIvi (P6xx), LC series */
 
-               case MAC_VIA_IIci:      
+               case MAC_VIA_IIci:
                        via1 = (void *) VIA1_BASE;
                        if (macintosh_config->ident == MAC_MODEL_IIFX) {
                                via2 = NULL;
@@ -166,7 +166,7 @@ void __init via_init(void)
        via1[vT2CH] = 0;
        via1[vACR] &= 0x3F;
 
-       /* 
+       /*
         * SE/30: disable video IRQ
         * XXX: testing for SE/30 VBL
         */
@@ -174,8 +174,8 @@ void __init via_init(void)
        if (macintosh_config->ident == MAC_MODEL_SE30) {
                via1[vDirB] |= 0x40;
                via1[vBufB] |= 0x40;
-       } 
-       
+       }
+
        /*
         * Set the RTC bits to a known state: all lines to outputs and
         * RTC disabled (yes that's 0 to enable and 1 to disable).
@@ -243,7 +243,7 @@ void __init via_init(void)
  */
 
 void __init via_init_clock(irqreturn_t (*func)(int, void *, struct pt_regs *))
-{      
+{
        via1[vACR] |= 0x40;
        via1[vT1LL] = MAC_CLOCK_LOW;
        via1[vT1LH] = MAC_CLOCK_HIGH;
@@ -537,7 +537,7 @@ void via_irq_enable(int irq) {
                        /* But not on PowerBooks, that's ADB... */
                        if ((macintosh_config->adb_type != MAC_ADB_PB1) &&
                           (macintosh_config->adb_type != MAC_ADB_PB2)) {
-                               switch(macintosh_config->ident)
+                               switch(macintosh_config->ident)
                                {
                                        case MAC_MODEL_II:
                                        case MAC_MODEL_IIX: