linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / i386 / mach-voyager / voyager_cat.c

diff --git a/arch/i386/mach-voyager/voyager_cat.c b/arch/i386/mach-voyager/voyager_cat.c
index f50c6c6..23967fe 100644 (file)
--- a/arch/i386/mach-voyager/voyager_cat.c
+++ b/arch/i386/mach-voyager/voyager_cat.c
@@ -16,6 +16,7 @@
  * of bit shift manipulations to send and receive packets on the
  * serial bus */
 
+#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/completion.h>
 #include <linux/sched.h>
@@ -105,20 +106,15 @@ voyager_module_t *voyager_cat_list;
 
 /* the I/O port assignments for the VIC and QIC */
 static struct resource vic_res = {
-       .name   = "Voyager Interrupt Controller",
-       .start  = 0xFC00,
-       .end    = 0xFC6F
-};
+       "Voyager Interrupt Controller", 0xFC00, 0xFC6F };
 static struct resource qic_res = {
-       .name   = "Quad Interrupt Controller",
-       .start  = 0xFC70,
-       .end    = 0xFCFF
-};
+       "Quad Interrupt Controller", 0xFC70, 0xFCFF };
 
 /* This function is used to pack a data bit stream inside a message.
  * It writes num_bits of the data buffer in msg starting at start_bit.
  * Note: This function assumes that any unused bit in the data stream
  * is set to zero so that the ors will work correctly */
+#define BITS_PER_BYTE 8
 static void
 cat_pack(__u8 *msg, const __u16 start_bit, __u8 *data, const __u16 num_bits)
 {