Messages in this thread Patch in this message | | | From | Jeff Garzik <> | Subject | [PATCH 12/16] [ISDN] HiSax gazel: ifdef bug fixes for x86-64 | Date | Mon, 29 Oct 2007 15:39:12 -0400 (EDT) |
| |
Signed-off-by: Jeff Garzik <jeff@garzik.org> --- drivers/isdn/hisax/gazel.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/isdn/hisax/gazel.c b/drivers/isdn/hisax/gazel.c index 1a09b8b..4855e2a 100644 --- a/drivers/isdn/hisax/gazel.c +++ b/drivers/isdn/hisax/gazel.c @@ -22,8 +22,11 @@ #include <linux/pci.h> static int gazel_protocol; /* 0 == use DEFAULT_PROTO */ + +#ifdef CONFIG_ISA static int gazel_irq; /* 0 == no ISA probing */ static int gazel_io_base; /* 0 == no ISA probing */ +#endif /* CONFIG_ISA */ static const char *gazel_revision = "$Revision: 2.19.2.4 $"; @@ -489,6 +492,7 @@ reserve_regions(struct IsdnCard *card, struct IsdnCardState *cs) return 1; } +#ifdef CONFIG_ISA static void __devinit setup_gazelisa(struct IsdnCard *card, struct IsdnCardState *cs) { @@ -534,7 +538,9 @@ setup_gazelisa(struct IsdnCard *card, struct IsdnCardState *cs) break; } } +#endif /* CONFIG_ISA */ +#ifdef CONFIG_PCI static int __devinit setup_gazelpci(struct IsdnCard *card) { @@ -601,6 +607,7 @@ setup_gazelpci(struct IsdnCard *card) return (0); } +#endif /* CONFIG_PCI */ static int __devinit setup_gazel_rest(struct IsdnCard *card) @@ -660,7 +667,7 @@ static int __devinit gazel_isa_setup(struct IsdnCard *card) setup_gazelisa(card, cs); - return setup_gazel_rest(cs); + return setup_gazel_rest(card); } static int __devinit gazel_isa_init_one(struct device *dev, unsigned int id) @@ -709,7 +716,7 @@ static int __devinit gazel_pci_setup(struct IsdnCard *card) if (setup_gazelpci(card)) return 1; /* error */ - return setup_gazel_rest(card->cs); + return setup_gazel_rest(card); } static int __devinit gazel_pci_init_one(struct pci_dev *pdev, -- 1.5.2.4 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |