diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
| commit | 5bc65793cbf8da0d35f19ef025dda22887e79e80 (patch) | |
| tree | 8291998abd73055de6f487fafa174ee2a5d3afee /drivers/ieee1394/sbp2.c | |
| parent | 6edae708bf77e012d855a7e2c7766f211d234f4f (diff) | |
| parent | 3f0a6766e0cc5a577805732e5adb50a585c58175 (diff) | |
[SCSI] Merge up to linux-2.6 head
Conflicts:
drivers/scsi/jazz_esp.c
Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/ieee1394/sbp2.c')
| -rw-r--r-- | drivers/ieee1394/sbp2.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c index d0db6f8b5206..ce86ff226a28 100644 --- a/drivers/ieee1394/sbp2.c +++ b/drivers/ieee1394/sbp2.c | |||
| @@ -70,6 +70,7 @@ | |||
| 70 | #include <linux/stringify.h> | 70 | #include <linux/stringify.h> |
| 71 | #include <linux/types.h> | 71 | #include <linux/types.h> |
| 72 | #include <linux/wait.h> | 72 | #include <linux/wait.h> |
| 73 | #include <linux/workqueue.h> | ||
| 73 | 74 | ||
| 74 | #include <asm/byteorder.h> | 75 | #include <asm/byteorder.h> |
| 75 | #include <asm/errno.h> | 76 | #include <asm/errno.h> |