The patch titled
fdomain.c: get rid of unused stuff
has been removed from the -mm tree. Its filename was
fdomainc-get-rid-of-unused-stuff.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: fdomain.c: get rid of unused stuff
From: Parag Warudkar <[EMAIL PROTECTED]>
fdomain.c uses the below stuff only if PCMCIA is not defined. This causes
unused variables to be defined when PCMCIA is not defined. Wrap variables
and functions around #ifndef PCMCIA appropriately to avoid this.
4 less compiler warnings.
Signed-off-by: Parag Warudkar <[EMAIL PROTECTED]>
Cc: James Bottomley <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
drivers/scsi/fdomain.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletion(-)
diff -puN drivers/scsi/fdomain.c~fdomainc-get-rid-of-unused-stuff
drivers/scsi/fdomain.c
--- a/drivers/scsi/fdomain.c~fdomainc-get-rid-of-unused-stuff
+++ a/drivers/scsi/fdomain.c
@@ -410,6 +410,7 @@ static irqreturn_t do_fdomain_16x0
static char * fdomain = NULL;
module_param(fdomain, charp, 0);
+#ifndef PCMCIA
static unsigned long addresses[] = {
0xc8000,
0xca000,
@@ -502,6 +503,7 @@ static struct signature {
};
#define SIGNATURE_COUNT ARRAY_SIZE(signatures)
+#endif /* ifndef PCMCIA */
static void print_banner( struct Scsi_Host *shpnt )
{
@@ -646,7 +648,7 @@ static int fdomain_test_loopback( void )
Sometimes it is possible to use the computer's BIOS setup screen to
configure a PCI system so that one of these IRQs will be used by the
Future Domain card. */
-
+#ifndef PCMCIA
static int fdomain_get_irq( int base )
{
int options = inb(base + Configuration1);
@@ -664,6 +666,7 @@ static int fdomain_get_irq( int base )
return 0;
return ints[(options & 0x0e) >> 1];
}
+#endif
static int fdomain_isa_detect( int *irq, int *iobase )
{
_
Patches currently in -mm which might be from [EMAIL PROTECTED] are
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
