[PATCH 12/14] [ISDN] HiSax avm_pci, niccy: minor PNP fixes and cleanups

[Jeff Garzik]

Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 drivers/isdn/hisax/avm_pci.c |    9 ++++++---
 drivers/isdn/hisax/niccy.c   |    2 ++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/isdn/hisax/avm_pci.c b/drivers/isdn/hisax/avm_pci.c
index 69f8389..0b420aa 100644
--- a/drivers/isdn/hisax/avm_pci.c
+++ b/drivers/isdn/hisax/avm_pci.c
@@ -781,8 +781,8 @@ static int __devinit avm_isa_setup(struct IsdnCard *card)
        struct IsdnCardState *cs = card->cs;
 
        /* old manual method */
-       cs->hw.avm.cfg_reg = avm_io_base;
-       cs->irq = avm_irq;
+       cs->hw.avm.cfg_reg = card->para[1];
+       cs->irq = card->para[0];
        cs->subtyp = AVM_FRITZ_PNP;
 
        return avm_setup_rest(cs);
@@ -793,7 +793,8 @@ static int __devinit avm_isa_init_one(struct device *dev, 
unsigned int id)
        struct IsdnCard icard = { ISDN_CTYPE_FRITZPCI, };
        int cardnr;
 
-       icard.para[0] = (unsigned long) dev;
+       icard.para[0] = avm_irq;
+       icard.para[1] = avm_io_base;
        if (!avm_protocol)
                icard.protocol = DEFAULT_PROTO;
        else
@@ -889,6 +890,8 @@ static struct pnp_device_id avm_pnp_table[] = {
        { .id = "" }            /* terminate list */
 };
 
+MODULE_DEVICE_TABLE(pnp, avm_pnp_table);
+
 static struct pnp_driver avm_pnp_driver = {
        .name           = "avm_pci",
        .id_table       = avm_pnp_table,
diff --git a/drivers/isdn/hisax/niccy.c b/drivers/isdn/hisax/niccy.c
index ef48515..cbe1432 100644
--- a/drivers/isdn/hisax/niccy.c
+++ b/drivers/isdn/hisax/niccy.c
@@ -397,6 +397,8 @@ static struct pnp_device_id niccy_pnp_table[] = {
        { .id = "" }            /* terminate list */
 };
 
+MODULE_DEVICE_TABLE(pnp, niccy_pnp_table);
+
 static struct pnp_driver niccy_pnp_driver = {
        .name           = "niccy",
        .id_table       = niccy_pnp_table,
-- 
1.5.3.8

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/