diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
| commit | 4a1032faac94ebbf647460ae3e06fc21146eb280 (patch) | |
| tree | 7f31b97beb0406faa1523e619289ad0ab07c9787 /drivers/scsi/3w-sas.c | |
| parent | ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06 (diff) | |
| parent | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/scsi/3w-sas.c')
| -rw-r--r-- | drivers/scsi/3w-sas.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/3w-sas.c b/drivers/scsi/3w-sas.c index 4d314d740de4..54c5ffb1eaa1 100644 --- a/drivers/scsi/3w-sas.c +++ b/drivers/scsi/3w-sas.c | |||
| @@ -65,6 +65,7 @@ | |||
| 65 | #include <linux/time.h> | 65 | #include <linux/time.h> |
| 66 | #include <linux/mutex.h> | 66 | #include <linux/mutex.h> |
| 67 | #include <linux/smp_lock.h> | 67 | #include <linux/smp_lock.h> |
| 68 | #include <linux/slab.h> | ||
| 68 | #include <asm/io.h> | 69 | #include <asm/io.h> |
| 69 | #include <asm/irq.h> | 70 | #include <asm/irq.h> |
| 70 | #include <asm/uaccess.h> | 71 | #include <asm/uaccess.h> |