diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-09 22:27:33 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-09 22:27:33 -0700 |
| commit | e548833df83c3554229eff0672900bfe958b45fd (patch) | |
| tree | 85efc4a76dc356593d6d394776aeb845dc580fb6 /drivers/scsi/arcmsr/arcmsr_hba.c | |
| parent | cbd9da7be869f676afc204e1a664163778c770bd (diff) | |
| parent | 053d8f6622701f849fda2ca2c9ae596c13599ba9 (diff) | |
| download | kernel_samsung_smdk4412-e548833df83c3554229eff0672900bfe958b45fd.zip kernel_samsung_smdk4412-e548833df83c3554229eff0672900bfe958b45fd.tar.gz kernel_samsung_smdk4412-e548833df83c3554229eff0672900bfe958b45fd.tar.bz2 | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/main.c
Diffstat (limited to 'drivers/scsi/arcmsr/arcmsr_hba.c')
| -rw-r--r-- | drivers/scsi/arcmsr/arcmsr_hba.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c index 95a895d..c8dc392 100644 --- a/drivers/scsi/arcmsr/arcmsr_hba.c +++ b/drivers/scsi/arcmsr/arcmsr_hba.c @@ -56,6 +56,7 @@ #include <linux/delay.h> #include <linux/dma-mapping.h> #include <linux/timer.h> +#include <linux/slab.h> #include <linux/pci.h> #include <linux/aer.h> #include <asm/dma.h> |