From: Jeff Garzik <jeff@garzik.org>
To: linux-kernel@vger.kernel.org, isdn4linux@listserv.isdn4linux.de
Cc: kkeil@suse.de, akpm@linux-foundation.org
Subject: [PATCH 12/16] [ISDN] HiSax gazel: ifdef bug fixes for x86-64
Date: Mon, 29 Oct 2007 15:39:12 -0400 (EDT) [thread overview]
Message-ID: <0c9a8ba73c57e9f287c3d9062b6af0f124e1ae9b.1193686445.git.jeff@garzik.org> (raw)
In-Reply-To: <eb2aa159d7f722c61d637feb287bc0f2f9519b1d.1193686445.git.jeff@garzik.org>
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
next prev parent reply other threads:[~2007-10-29 19:42 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-29 19:38 [PATCH 00/16] [ISDN] HiSax: modularize card setup Jeff Garzik
2007-10-29 19:38 ` [PATCH 01/16] " Jeff Garzik
2007-10-29 19:38 ` [PATCH 02/16] [ISDN] Ready HiSax driver for modularization Jeff Garzik
2007-10-29 19:38 ` [PATCH 03/16] [ISDN] HiSax bkm_a4t: convert to PCI hotplug API Jeff Garzik
2007-10-29 19:39 ` [PATCH 04/16] [ISDN] HiSax enternow: " Jeff Garzik
2007-10-29 19:39 ` [PATCH 05/16] [ISDN] HiSax hfc_pci, w6692: " Jeff Garzik
2007-10-29 19:39 ` [PATCH 06/16] [ISDN] HiSax nj_s, nj_u: " Jeff Garzik
2007-10-29 19:39 ` [PATCH 07/16] [ISDN] HiSax telespci: " Jeff Garzik
2007-10-29 19:39 ` [PATCH 08/16] [ISDN] HiSax: additional export to make things proper Jeff Garzik
2007-10-29 19:39 ` [PATCH 09/16] [ISDN] HiSax avm_pci: convert to modern probing Jeff Garzik
2007-10-29 19:39 ` [PATCH 10/16] [ISDN] HiSax acm_pci: fix module unload Jeff Garzik
2007-10-29 19:39 ` [PATCH 11/16] [ISDN] HiSax gazel: convert to ISA/PCI new probing Jeff Garzik
2007-10-29 19:39 ` Jeff Garzik [this message]
2007-10-29 19:39 ` [PATCH 13/16] [ISDN] HiSax niccy: convert to ISA/PNP/PCI new style probing Jeff Garzik
2007-10-29 19:39 ` [PATCH 14/16] [ISDN] HiSax diva: convert to PCI/PNP/ISA new-style APIs Jeff Garzik
2007-10-29 19:39 ` [PATCH 15/16] [ISDN] HiSax diva: ia32 build fixes Jeff Garzik
2007-10-29 19:39 ` [PATCH 16/16] [ISDN] HiSax bkm_a8: convert to PCI hotplug API Jeff Garzik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0c9a8ba73c57e9f287c3d9062b6af0f124e1ae9b.1193686445.git.jeff@garzik.org \
--to=jeff@garzik.org \
--cc=akpm@linux-foundation.org \
--cc=isdn4linux@listserv.isdn4linux.de \
--cc=kkeil@suse.de \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®