vserver 2.0 rc7

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

diff --git a/drivers/input/serio/ct82c710.c b/drivers/input/serio/ct82c710.c
index ee78546..dd0f5bd 100644 (file)
--- a/drivers/input/serio/ct82c710.c
+++ b/drivers/input/serio/ct82c710.c
@@ -181,7 +181,7 @@ static struct serio * __init ct82c710_allocate_port(void)
        serio = kmalloc(sizeof(struct serio), GFP_KERNEL);
        if (serio) {
                memset(serio, 0, sizeof(struct serio));
-               serio->type = SERIO_8042;
+               serio->id.type = SERIO_8042;
                serio->open = ct82c710_open;
                serio->close = ct82c710_close;
                serio->write = ct82c710_write;
@@ -193,7 +193,7 @@ static struct serio * __init ct82c710_allocate_port(void)
        return serio;
 }
 
-int __init ct82c710_init(void)
+static int __init ct82c710_init(void)
 {
        if (ct82c710_probe())
                return -ENODEV;
@@ -215,7 +215,7 @@ int __init ct82c710_init(void)
        return 0;
 }
 
-void __exit ct82c710_exit(void)
+static void __exit ct82c710_exit(void)
 {
        serio_unregister_port(ct82c710_port);
        platform_device_unregister(ct82c710_device);