Merge branch 'next' into for-linus

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

diff --git a/drivers/input/serio/ioc3kbd.c b/drivers/input/serio/ioc3kbd.c
index 50552dc7b4f5e689b7f1e9e63f9104e80efc57c2..676b0bda3d720c2dbbeb735f828817cbe03618b7 100644 (file)
--- a/drivers/input/serio/ioc3kbd.c
+++ b/drivers/input/serio/ioc3kbd.c
@@ -200,9 +200,16 @@ static void ioc3kbd_remove(struct platform_device *pdev)
        serio_unregister_port(d->aux);
 }
 
+static const struct platform_device_id ioc3kbd_id_table[] = {
+       { "ioc3-kbd", },
+       { }
+};
+MODULE_DEVICE_TABLE(platform, ioc3kbd_id_table);
+
 static struct platform_driver ioc3kbd_driver = {
        .probe          = ioc3kbd_probe,
        .remove_new     = ioc3kbd_remove,
+       .id_table       = ioc3kbd_id_table,
        .driver = {
                .name = "ioc3-kbd",
        },