diff options
| author | Johannes Thumshirn <jthumshirn@suse.de> | 2015-06-03 09:56:42 +0200 |
|---|---|---|
| committer | James Bottomley <JBottomley@Odin.com> | 2015-06-13 08:42:36 -0700 |
| commit | 8810eac83624ab1ad593c59da43e187179f5941e (patch) | |
| tree | 71bb8b59af648611679e0cbca5f23de7fd39f172 /drivers/scsi | |
| parent | 2865c073257eaf1ede043a4dbc77afc71b6de175 (diff) | |
| download | op-kernel-dev-8810eac83624ab1ad593c59da43e187179f5941e.zip op-kernel-dev-8810eac83624ab1ad593c59da43e187179f5941e.tar.gz | |
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 14d3aa5..4305178 100644 --- a/drivers/scsi/advansys.c +++ b/drivers/scsi/advansys.c @@ -37,6 +37,7 @@ #include <linux/spinlock.h> #include <linux/dma-mapping.h> #include <linux/firmware.h> +#include <linux/dmapool.h> #include <asm/io.h> #include <asm/dma.h> @@ -9435,6 +9436,7 @@ static int AscInitSetConfig(struct pci_dev *pdev, struct Scsi_Host *shost) * on big-endian platforms so char fields read as words are actually being * unswapped on big-endian platforms. */ +#ifdef CONFIG_PCI static ADVEEP_3550_CONFIG Default_3550_EEPROM_Config = { ADV_EEPROM_BIOS_ENABLE, /* cfg_lsw */ 0x0000, /* cfg_msw */ @@ -9771,7 +9773,6 @@ static ADVEEP_38C1600_CONFIG ADVEEP_38C1600_Config_Field_IsChar = { 0 /* 63 reserved */ }; -#ifdef CONFIG_PCI /* * Wait for EEPROM command to complete */ @@ -11385,7 +11386,9 @@ static int advansys_board_found(struct Scsi_Host *shost, unsigned int iop, err_unmap: if (boardp->ioremap_addr) iounmap(boardp->ioremap_addr); +#ifdef CONFIG_PCI err_shost: +#endif return ret; } |
