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/ibmvscsi/ibmvscsi.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/ibmvscsi/ibmvscsi.c')
| -rw-r--r-- | drivers/scsi/ibmvscsi/ibmvscsi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c index dc1bcbe3b176..ff5ec5ac1fb5 100644 --- a/drivers/scsi/ibmvscsi/ibmvscsi.c +++ b/drivers/scsi/ibmvscsi/ibmvscsi.c | |||
| @@ -70,6 +70,7 @@ | |||
| 70 | #include <linux/moduleparam.h> | 70 | #include <linux/moduleparam.h> |
| 71 | #include <linux/dma-mapping.h> | 71 | #include <linux/dma-mapping.h> |
| 72 | #include <linux/delay.h> | 72 | #include <linux/delay.h> |
| 73 | #include <linux/slab.h> | ||
| 73 | #include <linux/of.h> | 74 | #include <linux/of.h> |
| 74 | #include <linux/pm.h> | 75 | #include <linux/pm.h> |
| 75 | #include <asm/firmware.h> | 76 | #include <asm/firmware.h> |