The patch titled
gdth build fix
has been removed from the -mm tree. Its filename was
gdth-build-fix.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: gdth build fix
From: Dhaval Giani <dhaval@xxxxxxxxxxxxxxxxxx>
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â??
make[2]: *** [drivers/scsi/gdth.o] Error 1
make[1]: *** [drivers/scsi] Error 2
make: *** [drivers] Error 2
[dhaval@gondor linux-2.6.23]$
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@xxxxxxxxxxxxxxxxxx>
Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/scsi/gdth.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN drivers/scsi/gdth.c~gdth-build-fix drivers/scsi/gdth.c
--- a/drivers/scsi/gdth.c~gdth-build-fix
+++ a/drivers/scsi/gdth.c
@@ -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 */
_
Patches currently in -mm which might be from dhaval@xxxxxxxxxxxxxxxxxx are
origin.patch
git-sched.patch
git-scsi-misc.patch
hook-up-group-scheduler-with-control-groups.patch
hook-up-group-scheduler-with-control-groups-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
