diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-04-22 20:08:44 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-04-22 20:08:44 -0400 |
| commit | 6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1 (patch) | |
| tree | 797676a336b050bfa1ef879377c07e541b9075d6 /drivers/scsi/scsi_tgt_if.c | |
| parent | 4cb3ca7cd7e2cae8d1daf5345ec99a1e8502cf3f (diff) | |
| parent | c81eddb0e3728661d1585fbc564449c94165cc36 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'drivers/scsi/scsi_tgt_if.c')
| -rw-r--r-- | drivers/scsi/scsi_tgt_if.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_tgt_if.c b/drivers/scsi/scsi_tgt_if.c index 0e9533f7aabc..a87e21c35ef2 100644 --- a/drivers/scsi/scsi_tgt_if.c +++ b/drivers/scsi/scsi_tgt_if.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | * 02110-1301 USA | 20 | * 02110-1301 USA |
| 21 | */ | 21 | */ |
| 22 | #include <linux/miscdevice.h> | 22 | #include <linux/miscdevice.h> |
| 23 | #include <linux/gfp.h> | ||
| 23 | #include <linux/file.h> | 24 | #include <linux/file.h> |
| 24 | #include <linux/smp_lock.h> | 25 | #include <linux/smp_lock.h> |
| 25 | #include <net/tcp.h> | 26 | #include <net/tcp.h> |