Commit c8e91b0a authored Oct 12, 2007 by Dhaval Giani Committed by James Bottomley Oct 12, 2007

[SCSI] gdth: fix CONFIG_ISA build failure



drivers/scsi/gdth.c: In function ‘gdth_search_dev’:
drivers/scsi/gdth.c:646: warning: ‘pci_find_device’ is deprecated
(declared at include/linux/pci.h:482)
drivers/scsi/gdth.c: In function ‘gdth_init_isa’:
drivers/scsi/gdth.c:857: error: ‘gdth_irq_tab’ undeclared (first use in
this function)
drivers/scsi/gdth.c:857: error: (Each undeclared identifier is reported
only once
drivers/scsi/gdth.c:857: error: for each function it appears in.)
drivers/scsi/gdth.c: In function ‘gdth_copy_internal_data’:
drivers/scsi/gdth.c:2362: warning: unused variable ‘sg’

Looking into the code I notice that gdth_irq_tab is not declared with
CONFIG_ISA=y and !CONFIG_EISA.

The values seem to be same in 2.6.23 (I am not sure why it has been put
with #ifdefs in -mm) so I have just modified the #ifdef to take care of
CONFIG_ISA as well.

Signed-off-by: Dhaval Giani <dhaval@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

parent 76246808

drivers/scsi/gdth.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -288,7 +288,7 @@ static struct timer_list gdth_timer;
		#ifdef CONFIG_ISA
		static unchar gdth_drq_tab[4] = {5,6,7,7}; /* DRQ table */
		#endif
		#ifdef CONFIG_EISA
		#if defined(CONFIG_EISA) \|\| defined(CONFIG_ISA)
		static unchar gdth_irq_tab[6] = {0,10,11,12,14,0}; /* IRQ table */
		#endif
		static unchar gdth_polling; /* polling if TRUE */

Admin message