aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/char/istallion.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index 28e9230e887a..40c256d787fc 100644
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -355,6 +355,7 @@ MODULE_PARM_DESC(board2, "Board 2 config -> name[,ioaddr[,memaddr]");
355module_param_array(board3, charp, NULL, 0); 355module_param_array(board3, charp, NULL, 0);
356MODULE_PARM_DESC(board3, "Board 3 config -> name[,ioaddr[,memaddr]"); 356MODULE_PARM_DESC(board3, "Board 3 config -> name[,ioaddr[,memaddr]");
357 357
358#if STLI_EISAPROBE != 0
358/* 359/*
359 * Set up a default memory address table for EISA board probing. 360 * Set up a default memory address table for EISA board probing.
360 * The default addresses are all bellow 1Mbyte, which has to be the 361 * The default addresses are all bellow 1Mbyte, which has to be the
@@ -372,6 +373,7 @@ static unsigned long stli_eisamemprobeaddrs[] = {
372}; 373};
373 374
374static int stli_eisamempsize = ARRAY_SIZE(stli_eisamemprobeaddrs); 375static int stli_eisamempsize = ARRAY_SIZE(stli_eisamemprobeaddrs);
376#endif
375 377
376/* 378/*
377 * Define the Stallion PCI vendor and device IDs. 379 * Define the Stallion PCI vendor and device IDs.
@@ -684,7 +686,9 @@ static struct stliport *stli_getport(unsigned int brdnr, unsigned int panelnr, u
684 686
685static int stli_initecp(struct stlibrd *brdp); 687static int stli_initecp(struct stlibrd *brdp);
686static int stli_initonb(struct stlibrd *brdp); 688static int stli_initonb(struct stlibrd *brdp);
689#if STLI_EISAPROBE != 0
687static int stli_eisamemprobe(struct stlibrd *brdp); 690static int stli_eisamemprobe(struct stlibrd *brdp);
691#endif
688static int stli_initports(struct stlibrd *brdp); 692static int stli_initports(struct stlibrd *brdp);
689 693
690/*****************************************************************************/ 694/*****************************************************************************/
@@ -3711,6 +3715,7 @@ static int __devinit stli_brdinit(struct stlibrd *brdp)
3711 return 0; 3715 return 0;
3712} 3716}
3713 3717
3718#if STLI_EISAPROBE != 0
3714/*****************************************************************************/ 3719/*****************************************************************************/
3715 3720
3716/* 3721/*
@@ -3804,6 +3809,7 @@ static int stli_eisamemprobe(struct stlibrd *brdp)
3804 } 3809 }
3805 return 0; 3810 return 0;
3806} 3811}
3812#endif
3807 3813
3808static int stli_getbrdnr(void) 3814static int stli_getbrdnr(void)
3809{ 3815{
@@ -3819,6 +3825,7 @@ static int stli_getbrdnr(void)
3819 return -1; 3825 return -1;
3820} 3826}
3821 3827
3828#if STLI_EISAPROBE != 0
3822/*****************************************************************************/ 3829/*****************************************************************************/
3823 3830
3824/* 3831/*
@@ -3894,6 +3901,9 @@ static int stli_findeisabrds(void)
3894 3901
3895 return 0; 3902 return 0;
3896} 3903}
3904#else
3905static inline int stli_findeisabrds(void) { return 0; }
3906#endif
3897 3907
3898/*****************************************************************************/ 3908/*****************************************************************************/
3899 3909
@@ -4019,8 +4029,7 @@ static int stli_initbrds(void)
4019 stli_brdinit(brdp); 4029 stli_brdinit(brdp);
4020 } 4030 }
4021 4031
4022 if (STLI_EISAPROBE) 4032 stli_findeisabrds();
4023 stli_findeisabrds();
4024 4033
4025 retval = pci_register_driver(&stli_pcidriver); 4034 retval = pci_register_driver(&stli_pcidriver);
4026 /* TODO: check retval and do something */ 4035 /* TODO: check retval and do something */