diff options
author | Johannes Thumshirn <jthumshirn@suse.de> | 2015-06-03 03:56:42 -0400 |
---|---|---|
committer | James Bottomley <JBottomley@Odin.com> | 2015-06-13 11:42:36 -0400 |
commit | 8810eac83624ab1ad593c59da43e187179f5941e (patch) | |
tree | 71bb8b59af648611679e0cbca5f23de7fd39f172 /drivers/scsi | |
parent | 2865c073257eaf1ede043a4dbc77afc71b6de175 (diff) |
advansys: fix compilation errors and warnings when CONFIG_PCI is not set
Fix compilation errors on forgotten #include <linux/dmapool.h> and warnings when
CONFIG_PCI is not set.
Reported-by: Jim Davis <jim.epost@gmail.com>
Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/advansys.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c index 14d3aa54daa5..4305178e4e01 100644 --- a/drivers/scsi/advansys.c +++ b/drivers/scsi/advansys.c | |||
@@ -37,6 +37,7 @@ | |||
37 | #include <linux/spinlock.h> | 37 | #include <linux/spinlock.h> |
38 | #include <linux/dma-mapping.h> | 38 | #include <linux/dma-mapping.h> |
39 | #include <linux/firmware.h> | 39 | #include <linux/firmware.h> |
40 | #include <linux/dmapool.h> | ||
40 | 41 | ||
41 | #include <asm/io.h> | 42 | #include <asm/io.h> |
42 | #include <asm/dma.h> | 43 | #include <asm/dma.h> |
@@ -9435,6 +9436,7 @@ static int AscInitSetConfig(struct pci_dev *pdev, struct Scsi_Host *shost) | |||
9435 | * on big-endian platforms so char fields read as words are actually being | 9436 | * on big-endian platforms so char fields read as words are actually being |
9436 | * unswapped on big-endian platforms. | 9437 | * unswapped on big-endian platforms. |
9437 | */ | 9438 | */ |
9439 | #ifdef CONFIG_PCI | ||
9438 | static ADVEEP_3550_CONFIG Default_3550_EEPROM_Config = { | 9440 | static ADVEEP_3550_CONFIG Default_3550_EEPROM_Config = { |
9439 | ADV_EEPROM_BIOS_ENABLE, /* cfg_lsw */ | 9441 | ADV_EEPROM_BIOS_ENABLE, /* cfg_lsw */ |
9440 | 0x0000, /* cfg_msw */ | 9442 | 0x0000, /* cfg_msw */ |
@@ -9771,7 +9773,6 @@ static ADVEEP_38C1600_CONFIG ADVEEP_38C1600_Config_Field_IsChar = { | |||
9771 | 0 /* 63 reserved */ | 9773 | 0 /* 63 reserved */ |
9772 | }; | 9774 | }; |
9773 | 9775 | ||
9774 | #ifdef CONFIG_PCI | ||
9775 | /* | 9776 | /* |
9776 | * Wait for EEPROM command to complete | 9777 | * Wait for EEPROM command to complete |
9777 | */ | 9778 | */ |
@@ -11385,7 +11386,9 @@ static int advansys_board_found(struct Scsi_Host *shost, unsigned int iop, | |||
11385 | err_unmap: | 11386 | err_unmap: |
11386 | if (boardp->ioremap_addr) | 11387 | if (boardp->ioremap_addr) |
11387 | iounmap(boardp->ioremap_addr); | 11388 | iounmap(boardp->ioremap_addr); |
11389 | #ifdef CONFIG_PCI | ||
11388 | err_shost: | 11390 | err_shost: |
11391 | #endif | ||
11389 | return ret; | 11392 | return ret; |
11390 | } | 11393 | } |
11391 | 11394 | ||