Commit 3e54f826 authored by Paul Gortmaker's avatar Paul Gortmaker Committed by James Bottomley

[PATCH] scsi/advansys.c fix !CONFIG_PCI

advansys.c fails to build for old ISA cards when CONFIG_PCI is not
enabled.
Signed-off-by: default avatarPaul Gortmaker <p_gortmaker@yahoo.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent a013bff7
...@@ -4322,12 +4322,12 @@ advansys_detect(struct scsi_host_template *tpnt) ...@@ -4322,12 +4322,12 @@ advansys_detect(struct scsi_host_template *tpnt)
int ioport = 0; int ioport = 0;
int share_irq = FALSE; int share_irq = FALSE;
int iolen = 0; int iolen = 0;
struct device *dev = NULL;
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
int pci_init_search = 0; int pci_init_search = 0;
struct pci_dev *pci_devicep[ASC_NUM_BOARD_SUPPORTED]; struct pci_dev *pci_devicep[ASC_NUM_BOARD_SUPPORTED];
int pci_card_cnt_max = 0; int pci_card_cnt_max = 0;
int pci_card_cnt = 0; int pci_card_cnt = 0;
struct device *dev = NULL;
struct pci_dev *pci_devp = NULL; struct pci_dev *pci_devp = NULL;
int pci_device_id_cnt = 0; int pci_device_id_cnt = 0;
unsigned int pci_device_id[ASC_PCI_DEVICE_ID_CNT] = { unsigned int pci_device_id[ASC_PCI_DEVICE_ID_CNT] = {
...@@ -8944,7 +8944,7 @@ DvcAdvWritePCIConfigByte( ...@@ -8944,7 +8944,7 @@ DvcAdvWritePCIConfigByte(
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
pci_write_config_byte(to_pci_dev(asc_dvc->cfg->dev), offset, byte_data); pci_write_config_byte(to_pci_dev(asc_dvc->cfg->dev), offset, byte_data);
#else /* CONFIG_PCI */ #else /* CONFIG_PCI */
return 0; return;
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */
} }
...@@ -12014,13 +12014,13 @@ AscInitFromAscDvcVar( ...@@ -12014,13 +12014,13 @@ AscInitFromAscDvcVar(
PortAddr iop_base; PortAddr iop_base;
ushort cfg_msw; ushort cfg_msw;
ushort warn_code; ushort warn_code;
ushort pci_device_id; ushort pci_device_id = 0;
iop_base = asc_dvc->iop_base; iop_base = asc_dvc->iop_base;
#ifdef CONFIG_PCI
if (asc_dvc->cfg->dev) if (asc_dvc->cfg->dev)
pci_device_id = to_pci_dev(asc_dvc->cfg->dev)->device; pci_device_id = to_pci_dev(asc_dvc->cfg->dev)->device;
else #endif
pci_device_id = 0;
warn_code = 0; warn_code = 0;
cfg_msw = AscGetChipCfgMsw(iop_base); cfg_msw = AscGetChipCfgMsw(iop_base);
if ((cfg_msw & ASC_CFG_MSW_CLR_MASK) != 0) { if ((cfg_msw & ASC_CFG_MSW_CLR_MASK) != 0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment