Merge http://gkernel.bkbits.net/misc-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

diff --cc drivers/net/sb1000.c
index 6d993e467a03a0d4d556f217f2087bee8907fb25,e5cf5794a188bb8b9917c9ab7c0f319651800818..22f29be9d69517b870f38c8890aa6bf27f222500
--- 1/drivers/net/sb1000.c
--- 2/drivers/net/sb1000.c
+++ b/drivers/net/sb1000.c
@@@ -295,10 -295,10 +295,10 @@@ card_wait_for_busy_clear(const int ioad
        timeout = jiffies + TimeOutJiffies;
        while (a & 0x80 || a & 0x40) {
                /* a little sleep */
-               current->state = TASK_INTERRUPTIBLE;
-               schedule_timeout(0);
+               yield();
+ 
                a = inb(ioaddr[0] + 7);
 -              if (jiffies >= timeout) {
 +              if (time_after_eq(jiffies, timeout)) {
                        printk(KERN_WARNING "%s: card_wait_for_busy_clear timeout\n",
                                name);
                        return -ETIME;
@@@ -319,10 -319,10 +319,10 @@@ card_wait_for_ready(const int ioaddr[]
        timeout = jiffies + TimeOutJiffies;
        while (a & 0x80 || !(a & 0x40)) {
                /* a little sleep */
-               current->state = TASK_INTERRUPTIBLE;
-               schedule_timeout(0);
+               yield();
+ 
                a = inb(ioaddr[1] + 6);
 -              if (jiffies >= timeout) {
 +              if (time_after_eq(jiffies, timeout)) {
                        printk(KERN_WARNING "%s: card_wait_for_ready timeout\n",
                                name);
                        return -ETIME;