vserver 2.0 rc7

[linux-2.6.git] / drivers / input / serio / pcips2.c

diff --git a/drivers/input/serio/pcips2.c b/drivers/input/serio/pcips2.c
index 489749e..1e139c5 100644 (file)
--- a/drivers/input/serio/pcips2.c
+++ b/drivers/input/serio/pcips2.c
@@ -150,7 +150,7 @@ static int __devinit pcips2_probe(struct pci_dev *dev, const struct pci_device_i
        memset(ps2if, 0, sizeof(struct pcips2_data));
        memset(serio, 0, sizeof(struct serio));
 
-       serio->type             = SERIO_8042;
+       serio->id.type          = SERIO_8042;
        serio->write            = pcips2_write;
        serio->open             = pcips2_open;
        serio->close            = pcips2_close;
@@ -217,7 +217,7 @@ static struct pci_driver pcips2_driver = {
 
 static int __init pcips2_init(void)
 {
-       return pci_module_init(&pcips2_driver);
+       return pci_register_driver(&pcips2_driver);
 }
 
 static void __exit pcips2_exit(void)