diff options
Diffstat (limited to 'drivers/isdn/hisax/teles_cs.c')
-rw-r--r-- | drivers/isdn/hisax/teles_cs.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/isdn/hisax/teles_cs.c b/drivers/isdn/hisax/teles_cs.c index 3787fc70cf8f..7296102ca255 100644 --- a/drivers/isdn/hisax/teles_cs.c +++ b/drivers/isdn/hisax/teles_cs.c | |||
@@ -106,9 +106,8 @@ static int __devinit teles_probe(struct pcmcia_device *link) | |||
106 | and attributes of IO windows) are fixed by the nature of the | 106 | and attributes of IO windows) are fixed by the nature of the |
107 | device, and can be hard-wired here. | 107 | device, and can be hard-wired here. |
108 | */ | 108 | */ |
109 | link->io.NumPorts1 = 96; | 109 | link->resource[0]->end = 96; |
110 | link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; | 110 | link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO; |
111 | link->io.IOAddrLines = 5; | ||
112 | 111 | ||
113 | link->conf.Attributes = CONF_ENABLE_IRQ; | 112 | link->conf.Attributes = CONF_ENABLE_IRQ; |
114 | link->conf.IntType = INT_MEMORY_AND_IO; | 113 | link->conf.IntType = INT_MEMORY_AND_IO; |
@@ -153,16 +152,18 @@ static int teles_cs_configcheck(struct pcmcia_device *p_dev, | |||
153 | { | 152 | { |
154 | int j; | 153 | int j; |
155 | 154 | ||
155 | p_dev->io_lines = 5; | ||
156 | |||
156 | if ((cf->io.nwin > 0) && cf->io.win[0].base) { | 157 | if ((cf->io.nwin > 0) && cf->io.win[0].base) { |
157 | printk(KERN_INFO "(teles_cs: looks like the 96 model)\n"); | 158 | printk(KERN_INFO "(teles_cs: looks like the 96 model)\n"); |
158 | p_dev->io.BasePort1 = cf->io.win[0].base; | 159 | p_dev->resource[0]->start = cf->io.win[0].base; |
159 | if (!pcmcia_request_io(p_dev, &p_dev->io)) | 160 | if (!pcmcia_request_io(p_dev)) |
160 | return 0; | 161 | return 0; |
161 | } else { | 162 | } else { |
162 | printk(KERN_INFO "(teles_cs: looks like the 97 model)\n"); | 163 | printk(KERN_INFO "(teles_cs: looks like the 97 model)\n"); |
163 | for (j = 0x2f0; j > 0x100; j -= 0x10) { | 164 | for (j = 0x2f0; j > 0x100; j -= 0x10) { |
164 | p_dev->io.BasePort1 = j; | 165 | p_dev->resource[0]->start = j; |
165 | if (!pcmcia_request_io(p_dev, &p_dev->io)) | 166 | if (!pcmcia_request_io(p_dev)) |
166 | return 0; | 167 | return 0; |
167 | } | 168 | } |
168 | } | 169 | } |