fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / ide / pci / cmd640.c

diff --git a/drivers/ide/pci/cmd640.c b/drivers/ide/pci/cmd640.c
index 0eac8ee..61b5f9c 100644 (file)
--- a/drivers/ide/pci/cmd640.c
+++ b/drivers/ide/pci/cmd640.c
@@ -101,7 +101,8 @@
 #undef REALLY_SLOW_IO          /* most systems can safely undef this */
 #define CMD640_PREFETCH_MASKS 1
 
-#include <linux/config.h>
+//#define CMD640_DUMP_REGS
+
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
@@ -485,7 +486,7 @@ static void display_clocks (unsigned int index)
  * Pack active and recovery counts into single byte representation
  * used by controller
  */
-inline static u8 pack_nibbles (u8 upper, u8 lower)
+static inline u8 pack_nibbles (u8 upper, u8 lower)
 {
        return ((upper & 0x0f) << 4) | (lower & 0x0f);
 }
@@ -748,7 +749,7 @@ int __init ide_probe_for_cmd640x (void)
        put_cmd640_reg(0x5b, 0);
 
 #ifdef CMD640_DUMP_REGS
-       CMD640_DUMP_REGS;
+       cmd640_dump_regs();
 #endif
 
        /*
@@ -870,7 +871,7 @@ int __init ide_probe_for_cmd640x (void)
        }
 
 #ifdef CMD640_DUMP_REGS
-       CMD640_DUMP_REGS;
+       cmd640_dump_regs();
 #endif
        return 1;
 }