X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=drivers%2Ftelephony%2Fixj_pcmcia.c;h=a801036392cd8e8583504bff8b91cb9af355996f;hb=9a017a910346afd88ec2e065989903bf211a7d37;hp=99cb2246ac728c24e9d9b39335577dbeb713a6c0;hpb=777cb1b53dd11dbec6157adc97e9f908f6e8458c;p=deliverable%2Flinux.git

diff --git a/drivers/telephony/ixj_pcmcia.c b/drivers/telephony/ixj_pcmcia.c
index 99cb2246ac72..a801036392cd 100644
--- a/drivers/telephony/ixj_pcmcia.c
+++ b/drivers/telephony/ixj_pcmcia.c
@@ -8,7 +8,6 @@
 #include <linux/errno.h>	/* error codes */
 #include <linux/slab.h>
 
-#include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ds.h>
@@ -151,7 +150,8 @@ static int ixj_config(struct pcmcia_device * link)
 	/*
  	 *	Register the card with the core.
 	 */
-	j = ixj_pcmcia_probe(link->io.BasePort1, link->io.BasePort1 + 0x10);
+	j = ixj_pcmcia_probe(link->resource[0]->start,
+			     link->resource[0]->start + 0x10);
 
 	info->ndev = 1;
 	ixj_get_serial(link, j);