projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pcmcia: do not use io_req_t after call to pcmcia_request_io()
[deliverable/linux.git]
/
drivers
/
telephony
/
ixj_pcmcia.c
diff --git
a/drivers/telephony/ixj_pcmcia.c
b/drivers/telephony/ixj_pcmcia.c
index 99cb2246ac728c24e9d9b39335577dbeb713a6c0..a801036392cd8e8583504bff8b91cb9af355996f 100644
(file)
--- 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 <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>
#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.
*/
/*
* 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);
info->ndev = 1;
ixj_get_serial(link, j);
This page took
0.025541 seconds
and
5
git commands to generate.