Merge branch 'for-linus/2634-git-updates' of git://git.fluff.org/bjdooks/linux

[~andy/linux] / drivers / telephony / ixj_pcmcia.c

diff --git a/drivers/telephony/ixj_pcmcia.c b/drivers/telephony/ixj_pcmcia.c
index d442fd35620a1b9667d81547e65cb5d7f3bde7e7..99cb2246ac728c24e9d9b39335577dbeb713a6c0 100644 (file)
--- a/drivers/telephony/ixj_pcmcia.c
+++ b/drivers/telephony/ixj_pcmcia.c
@@ -22,7 +22,6 @@
 
 typedef struct ixj_info_t {
        int ndev;
-       dev_node_t node;
        struct ixj *port;
 } ixj_info_t;
 
@@ -155,8 +154,6 @@ static int ixj_config(struct pcmcia_device * link)
        j = ixj_pcmcia_probe(link->io.BasePort1, link->io.BasePort1 + 0x10);
 
        info->ndev = 1;
-       info->node.major = PHONE_MAJOR;
-       link->dev_node = &info->node;
        ixj_get_serial(link, j);
        return 0;