diff options
Diffstat (limited to 'drivers/input/serio')
-rw-r--r-- | drivers/input/serio/i8042-sparcio.h | 7 | ||||
-rw-r--r-- | drivers/input/serio/xilinx_ps2.c | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/drivers/input/serio/i8042-sparcio.h b/drivers/input/serio/i8042-sparcio.h index 29e17698b2a4..04e32f2d1241 100644 --- a/drivers/input/serio/i8042-sparcio.h +++ b/drivers/input/serio/i8042-sparcio.h | |||
@@ -96,8 +96,11 @@ static const struct of_device_id sparc_i8042_match[] = { | |||
96 | MODULE_DEVICE_TABLE(of, sparc_i8042_match); | 96 | MODULE_DEVICE_TABLE(of, sparc_i8042_match); |
97 | 97 | ||
98 | static struct of_platform_driver sparc_i8042_driver = { | 98 | static struct of_platform_driver sparc_i8042_driver = { |
99 | .name = "i8042", | 99 | .driver = { |
100 | .match_table = sparc_i8042_match, | 100 | .name = "i8042", |
101 | .owner = THIS_MODULE, | ||
102 | .of_match_table = sparc_i8042_match, | ||
103 | }, | ||
101 | .probe = sparc_i8042_probe, | 104 | .probe = sparc_i8042_probe, |
102 | .remove = __devexit_p(sparc_i8042_remove), | 105 | .remove = __devexit_p(sparc_i8042_remove), |
103 | }; | 106 | }; |
diff --git a/drivers/input/serio/xilinx_ps2.c b/drivers/input/serio/xilinx_ps2.c index 7a288c0ef1a6..e2c028d2638f 100644 --- a/drivers/input/serio/xilinx_ps2.c +++ b/drivers/input/serio/xilinx_ps2.c | |||
@@ -362,8 +362,11 @@ static const struct of_device_id xps2_of_match[] __devinitconst = { | |||
362 | MODULE_DEVICE_TABLE(of, xps2_of_match); | 362 | MODULE_DEVICE_TABLE(of, xps2_of_match); |
363 | 363 | ||
364 | static struct of_platform_driver xps2_of_driver = { | 364 | static struct of_platform_driver xps2_of_driver = { |
365 | .name = DRIVER_NAME, | 365 | .driver = { |
366 | .match_table = xps2_of_match, | 366 | .name = DRIVER_NAME, |
367 | .owner = THIS_MODULE, | ||
368 | .of_match_table = xps2_of_match, | ||
369 | }, | ||
367 | .probe = xps2_of_probe, | 370 | .probe = xps2_of_probe, |
368 | .remove = __devexit_p(xps2_of_remove), | 371 | .remove = __devexit_p(xps2_of_remove), |
369 | }; | 372 | }; |