diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-04-07 14:15:50 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-04-07 14:15:50 -0400 |
| commit | 454abcc57f1d48a976291bc4af73b5f087e21d70 (patch) | |
| tree | 5bba999ea3f31527da02b60604531cc5fb52ea57 /drivers/scsi | |
| parent | 88aab9341a315d81118be6b41c45e4fe32b94bc1 (diff) | |
| parent | 6221f222c0ebf1acdf7abcf927178f40e1a65e2a (diff) | |
Merge commit 'v2.6.39-rc2' into spi/merge
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/ultrastor.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/ultrastor.c b/drivers/scsi/ultrastor.c index 0571ef9639cb..9f4b58b7daad 100644 --- a/drivers/scsi/ultrastor.c +++ b/drivers/scsi/ultrastor.c | |||
| @@ -138,6 +138,7 @@ | |||
| 138 | #include <linux/spinlock.h> | 138 | #include <linux/spinlock.h> |
| 139 | #include <linux/stat.h> | 139 | #include <linux/stat.h> |
| 140 | #include <linux/bitops.h> | 140 | #include <linux/bitops.h> |
| 141 | #include <linux/delay.h> | ||
| 141 | 142 | ||
| 142 | #include <asm/io.h> | 143 | #include <asm/io.h> |
| 143 | #include <asm/system.h> | 144 | #include <asm/system.h> |