git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
pcmcia
/
tcic.c
diff --git
a/drivers/pcmcia/tcic.c
b/drivers/pcmcia/tcic.c
index
5f9b4be
..
f3b38e9
100644
(file)
--- a/
drivers/pcmcia/tcic.c
+++ b/
drivers/pcmcia/tcic.c
@@
-60,7
+60,7
@@
static int pc_debug;
module_param(pc_debug, int, 0644);
static int pc_debug;
module_param(pc_debug, int, 0644);
-static const char
*version
=
+static const char
version[]
=
"tcic.c 1.111 2000/02/15 04:13:12 (David Hinds)";
#define debug(lvl, fmt, arg...) do { \
"tcic.c 1.111 2000/02/15 04:13:12 (David Hinds)";
#define debug(lvl, fmt, arg...) do { \
@@
-868,10
+868,10
@@
static int tcic_set_mem_map(struct pcmcia_socket *sock, struct pccard_mem_map *m
static int tcic_init(struct pcmcia_socket *s)
{
int i;
static int tcic_init(struct pcmcia_socket *s)
{
int i;
+ struct resource res = { .start = 0, .end = 0x1000 };
pccard_io_map io = { 0, 0, 0, 0, 1 };
pccard_io_map io = { 0, 0, 0, 0, 1 };
- pccard_mem_map mem = {
0, 0, 0, 0, 0, 0
};
+ pccard_mem_map mem = {
.res = &res, .sys_stop = 0x1000,
};
- mem.sys_stop = 0x1000;
for (i = 0; i < 2; i++) {
io.map = i;
tcic_set_io_map(s, &io);
for (i = 0; i < 2; i++) {
io.map = i;
tcic_set_io_map(s, &io);