Merge branches 'pcmcia-config-loop' and 'pcmcia-printk' into pcmcia

[safe/jmp/linux-2.6] / drivers / pcmcia / pcmcia_ioctl.c

diff --git a/drivers/pcmcia/pcmcia_ioctl.c b/drivers/pcmcia/pcmcia_ioctl.c
index 419f97f..f555a50 100644 (file)
--- a/drivers/pcmcia/pcmcia_ioctl.c
+++ b/drivers/pcmcia/pcmcia_ioctl.c
@@ -58,7 +58,7 @@ typedef struct user_info_t {
 } user_info_t;
 
 
-#ifdef DEBUG
+#ifdef CONFIG_PCMCIA_DEBUG
 extern int ds_pc_debug;
 
 #define ds_dbg(lvl, fmt, arg...) do {          \
@@ -867,7 +867,7 @@ static int ds_ioctl(struct inode * inode, struct file * file,
                           &buf->win_info.map);
        break;
     case DS_REPLACE_CIS:
-       ret = pcmcia_replace_cis(s, &buf->cisdump);
+       ret = pcmcia_replace_cis(s, buf->cisdump.Data, buf->cisdump.Length);
        break;
     case DS_BIND_REQUEST:
        if (!capable(CAP_SYS_ADMIN)) {