vserver 2.0 rc7

[linux-2.6.git] / drivers / w1 / w1.h

diff --git a/drivers/w1/w1.h b/drivers/w1/w1.h
index 0abbcfd..abbddaf 100644 (file)
--- a/drivers/w1/w1.h
+++ b/drivers/w1/w1.h
@@ -24,9 +24,17 @@
 
 struct w1_reg_num
 {
+#if defined(__LITTLE_ENDIAN_BITFIELD)
        __u64   family:8,
                id:48,
                crc:8;
+#elif defined(__BIG_ENDIAN_BITFIELD)
+       __u64   crc:8,
+               id:48,
+               family:8;
+#else
+#error "Please fix <asm/byteorder.h>"
+#endif
 };
 
 #ifdef __KERNEL__
@@ -115,7 +123,6 @@ struct w1_master
 
        int                     need_exit;
        pid_t                   kpid;
-       wait_queue_head_t       kwait;
        struct semaphore        mutex;
 
        struct device_driver    *driver;