diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-04-12 13:49:28 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-12 13:49:28 -0400 |
| commit | 8065248069097dddf9945acfb2081025e9618c16 (patch) | |
| tree | eddf3fb0372ba0f65c01382d386942ea8d18932d /drivers/scsi/arcmsr/arcmsr_hba.c | |
| parent | e66a8ddff72e85605f2212a0ebc666c7e9116641 (diff) | |
| parent | b4838d12e1f3cb48c2489a0b08733b5dbf848297 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/scsi/arcmsr/arcmsr_hba.c')
| -rw-r--r-- | drivers/scsi/arcmsr/arcmsr_hba.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c index 2fe9e90e53d9..cbde1dca45ad 100644 --- a/drivers/scsi/arcmsr/arcmsr_hba.c +++ b/drivers/scsi/arcmsr/arcmsr_hba.c | |||
| @@ -61,7 +61,6 @@ | |||
| 61 | #include <linux/aer.h> | 61 | #include <linux/aer.h> |
| 62 | #include <asm/dma.h> | 62 | #include <asm/dma.h> |
| 63 | #include <asm/io.h> | 63 | #include <asm/io.h> |
| 64 | #include <asm/system.h> | ||
| 65 | #include <asm/uaccess.h> | 64 | #include <asm/uaccess.h> |
| 66 | #include <scsi/scsi_host.h> | 65 | #include <scsi/scsi_host.h> |
| 67 | #include <scsi/scsi.h> | 66 | #include <scsi/scsi.h> |