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/ncr53c8xx.c | |
| parent | 4cb3ca7cd7e2cae8d1daf5345ec99a1e8502cf3f (diff) | |
| parent | c81eddb0e3728661d1585fbc564449c94165cc36 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'drivers/scsi/ncr53c8xx.c')
| -rw-r--r-- | drivers/scsi/ncr53c8xx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/ncr53c8xx.c b/drivers/scsi/ncr53c8xx.c index a2d569828308..d013a2aa2fd5 100644 --- a/drivers/scsi/ncr53c8xx.c +++ b/drivers/scsi/ncr53c8xx.c | |||
| @@ -98,6 +98,7 @@ | |||
| 98 | #include <linux/delay.h> | 98 | #include <linux/delay.h> |
| 99 | #include <linux/dma-mapping.h> | 99 | #include <linux/dma-mapping.h> |
| 100 | #include <linux/errno.h> | 100 | #include <linux/errno.h> |
| 101 | #include <linux/gfp.h> | ||
| 101 | #include <linux/init.h> | 102 | #include <linux/init.h> |
| 102 | #include <linux/interrupt.h> | 103 | #include <linux/interrupt.h> |
| 103 | #include <linux/ioport.h> | 104 | #include <linux/ioport.h> |