lkml.org 
[lkml]   [2007]   [Oct]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 15/16] [ISDN] HiSax diva: ia32 build fixes
Date
---
drivers/isdn/hisax/diva.c | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/drivers/isdn/hisax/diva.c b/drivers/isdn/hisax/diva.c
index 33aacd0..4fd5440 100644
--- a/drivers/isdn/hisax/diva.c
+++ b/drivers/isdn/hisax/diva.c
@@ -24,7 +24,8 @@
#include "ipacx.h"
#include "isdnl1.h"
#include <linux/pci.h>
-#include <linux/isapnp.h>
+#include <linux/isa.h>
+#include <linux/pnp.h>

static int diva_protocol; /* 0 == use DEFAULT_PROTO */

@@ -1088,10 +1089,10 @@ static int __devinit diva_pnp_setup(struct IsdnCard *card)
{
struct IsdnCardState *cs = card->cs;
struct pnp_dev *pnp_d = (void *) card->para[0];
+ int ipid_function = card->para[1];
int err;

- printk(KERN_INFO "HiSax: %s detected\n",
- (char *)ipid->driver_data);
+ printk(KERN_INFO "HiSax: DIVA PNP detected\n");
pnp_disable_dev(pnp_d);
err = pnp_activate_dev(pnp_d);
if (err<0) {
@@ -1109,7 +1110,7 @@ static int __devinit diva_pnp_setup(struct IsdnCard *card)
}
cs->hw.diva.cfg_reg = card->para[1];
cs->irq = card->para[0];
- if (ipid->function == ISAPNP_FUNCTION(0xA1)) {
+ if (ipid_function == 0xA1) {
cs->subtyp = DIVA_IPAC_ISA;
cs->hw.diva.ctrl = 0;
cs->hw.diva.isac =
@@ -1145,6 +1146,7 @@ static int __devinit diva_pnp_init_one(struct pnp_dev *pdev,
int cardnr;

icard.para[0] = (unsigned long) pdev;
+ icard.para[1] = dev_id->driver_data;
if (!diva_protocol)
icard.protocol = DEFAULT_PROTO;
else
@@ -1166,12 +1168,12 @@ static void __devexit diva_pnp_remove_one(struct pnp_dev *pdev)
}

static struct pnp_device_id diva_pnp_table[] = {
- { .id = "GDI0051", },
- { .id = "GDI0071", },
- { .id = "GDI00A1", },
- { .id = "EIC0051", },
- { .id = "EIC0071", },
- { .id = "EIC00A1", },
+ { .id = "GDI0051", 0 },
+ { .id = "GDI0071", 0 },
+ { .id = "GDI00A1", 0xA1 },
+ { .id = "EIC0051", 0 },
+ { .id = "EIC0071", 0 },
+ { .id = "EIC00A1", 0xA1 },

{ .id = "" } /* terminate list */
};
--
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/

\
 
 \ /
  Last update: 2007-10-29 20:49    [from the cache]
©2003-2011 Jasper Spaans