diff options
| author | James Morris <jmorris@namei.org> | 2010-05-05 20:56:07 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-05-05 20:56:07 -0400 |
| commit | 0ffbe2699cda6afbe08501098dff8a8c2fe6ae09 (patch) | |
| tree | 81b1a2305d16c873371b65c5a863c0268036cefe /drivers/scsi/tmscsim.c | |
| parent | 4e5d6f7ec3833c0da9cf34fa5c53c6058c5908b6 (diff) | |
| parent | 7ebd467551ed6ae200d7835a84bbda0dcadaa511 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/scsi/tmscsim.c')
| -rw-r--r-- | drivers/scsi/tmscsim.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/tmscsim.c b/drivers/scsi/tmscsim.c index 9a4273445c0d..27866b0adfeb 100644 --- a/drivers/scsi/tmscsim.c +++ b/drivers/scsi/tmscsim.c | |||
| @@ -233,6 +233,7 @@ | |||
| 233 | #include <linux/interrupt.h> | 233 | #include <linux/interrupt.h> |
| 234 | #include <linux/init.h> | 234 | #include <linux/init.h> |
| 235 | #include <linux/spinlock.h> | 235 | #include <linux/spinlock.h> |
| 236 | #include <linux/slab.h> | ||
| 236 | #include <asm/io.h> | 237 | #include <asm/io.h> |
| 237 | 238 | ||
| 238 | #include <scsi/scsi.h> | 239 | #include <scsi/scsi.h> |