This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / mips / au1000 / db1x00 / mirage_ts.c

diff --git a/arch/mips/au1000/db1x00/mirage_ts.c b/arch/mips/au1000/db1x00/mirage_ts.c
index 58d41c2..c29852c 100644 (file)
--- a/arch/mips/au1000/db1x00/mirage_ts.c
+++ b/arch/mips/au1000/db1x00/mirage_ts.c
@@ -42,6 +42,7 @@
 #include <linux/proc_fs.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
+#include <linux/wait.h>
 
 #include <asm/segment.h>
 #include <asm/irq.h>
@@ -101,15 +102,15 @@ static struct {
 } mirage_ts_cal =
 {
 #if 0
-       xscale:   84,
-       xtrans: -157,
-       yscale:   66,
-       ytrans: -150,
+       .xscale   = 84,
+       .xtrans = -157,
+       .yscale   = 66,
+       .ytrans = -150,
 #else
-       xscale:   84,
-       xtrans: -150,
-       yscale:   66,
-       ytrans: -146,
+       .xscale   = 84,
+       .xtrans = -150,
+       .yscale   = 66,
+       .ytrans = -146,
 #endif
 };
 
@@ -147,10 +148,7 @@ static int ts_thread(void *id)
        ts = wm97xx_ts_get_handle(0);
 
        /* proceed only after everybody is ready */
-       while ( ! wm97xx_ts_ready(ts) ) {
-               /* give a little time for initializations to complete */
-               interruptible_sleep_on_timeout(&pendown_wait, HZ / 4);
-       }
+       wait_event_timeout(pendown_wait, wm97xx_ts_ready(ts), HZ/4);
 
        /* board-specific calibration */
        wm97xx_ts_set_cal(ts,