projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SCSI] fusion - adding raid support in mptsas
[powerpc.git]
/
drivers
/
ieee1394
/
amdtp.c
diff --git
a/drivers/ieee1394/amdtp.c
b/drivers/ieee1394/amdtp.c
index
e8e2856
..
17390d7
100644
(file)
--- a/
drivers/ieee1394/amdtp.c
+++ b/
drivers/ieee1394/amdtp.c
@@
-80,7
+80,6
@@
#include <linux/pci.h>
#include <linux/interrupt.h>
#include <linux/poll.h>
#include <linux/pci.h>
#include <linux/interrupt.h>
#include <linux/poll.h>
-#include <linux/ioctl32.h>
#include <linux/compat.h>
#include <linux/cdev.h>
#include <asm/uaccess.h>
#include <linux/compat.h>
#include <linux/cdev.h>
#include <asm/uaccess.h>
@@
-320,8
+319,7
@@
static void ohci1394_stop_it_ctx(struct ti_ohci *ohci, int ctx, int synchronous)
if ((control & OHCI1394_CONTEXT_ACTIVE) == 0)
break;
if ((control & OHCI1394_CONTEXT_ACTIVE) == 0)
break;
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(1);
+ schedule_timeout_interruptible(1);
}
}
}
}
}
}