[PATCH 5/8] Char: istallion, ifdef eisa code

[Jiri Slaby]

istallion, ifdef eisa code

Disable compiling eisa stuff if STLI_EISAPROBE == 0.

Signed-off-by: Jiri Slaby <jirislaby@xxxxxxxxx>

---
commit b2606947cdfd650f706f4d0f97574a2a00c325ce
tree f2bd24bf4ceafb6bd820e411da59f4a6c65b4d23
parent 5d593cca61510bc31b01025fa5f9070e143be2aa
author Jiri Slaby <jirislaby@xxxxxxxxx> Sat, 04 Nov 2006 20:42:02 +0059
committer Jiri Slaby <jirislaby@xxxxxxxxx> Sat, 04 Nov 2006 20:42:02 +0059

 drivers/char/istallion.c |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index 730db7f..aff6a4c 100644
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -355,6 +355,7 @@ MODULE_PARM_DESC(board2, "Board 2 config
 module_param_array(board3, charp, NULL, 0);
 MODULE_PARM_DESC(board3, "Board 3 config -> name[,ioaddr[,memaddr]");
 
+#if STLI_EISAPROBE != 0
 /*
  *	Set up a default memory address table for EISA board probing.
  *	The default addresses are all bellow 1Mbyte, which has to be the
@@ -372,6 +373,7 @@ static unsigned long	stli_eisamemprobead
 };
 
 static int	stli_eisamempsize = ARRAY_SIZE(stli_eisamemprobeaddrs);
+#endif
 
 /*
  *	Define the Stallion PCI vendor and device IDs.
@@ -684,7 +686,9 @@ static struct stliport *stli_getport(uns
 
 static int	stli_initecp(struct stlibrd *brdp);
 static int	stli_initonb(struct stlibrd *brdp);
+#if STLI_EISAPROBE != 0
 static int	stli_eisamemprobe(struct stlibrd *brdp);
+#endif
 static int	stli_initports(struct stlibrd *brdp);
 
 /*****************************************************************************/
@@ -3711,6 +3715,7 @@ static int __devinit stli_brdinit(struct
 	return 0;
 }
 
+#if STLI_EISAPROBE != 0
 /*****************************************************************************/
 
 /*
@@ -3804,6 +3809,7 @@ static int stli_eisamemprobe(struct stli
 	}
 	return 0;
 }
+#endif
 
 static int stli_getbrdnr(void)
 {
@@ -3819,6 +3825,7 @@ static int stli_getbrdnr(void)
 	return -1;
 }
 
+#if STLI_EISAPROBE != 0
 /*****************************************************************************/
 
 /*
@@ -3894,6 +3901,9 @@ static int stli_findeisabrds(void)
 
 	return 0;
 }
+#else
+static inline int stli_findeisabrds(void) { return 0; }
+#endif
 
 /*****************************************************************************/
 
@@ -4019,8 +4029,7 @@ static int stli_initbrds(void)
 		stli_brdinit(brdp);
 	}
 
-	if (STLI_EISAPROBE)
-		stli_findeisabrds();
+	stli_findeisabrds();
 
 	retval = pci_register_driver(&stli_pcidriver);
 	/* TODO: check retval and do something */
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/