diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-13 03:28:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-13 03:28:45 -0400 |
| commit | 9343af084c7e8911897b0883042ee690cee3aaef (patch) | |
| tree | 6211a4bdc84690bec6530d27a3abb19f5e8bb8f3 /drivers/scsi/tmscsim.c | |
| parent | e182c77cc291456eed127b1472952ddb59a81a9d (diff) | |
| parent | 0d0fb0f9c5fddef4a10242fe3337f00f528a3099 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
lib/Kconfig.debug
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> |