diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-12 15:40:41 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-12 15:40:41 -0500 |
commit | 2485a4b610171f4e1c4ab0d053569747795c1bbe (patch) | |
tree | 1a4532e447c2640bc1378e25e1ead9a7ba7847a5 /drivers/input/touchscreen | |
parent | 6733e54b669c600eb8e451939ad55130db664fed (diff) | |
parent | 52965cc012f7a3cf35f06485ec275ebf3b3fddae (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: bcm5974 - set BUTTONPAD property
Input: serio_raw - return proper result when serio_raw_write fails
Input: serio_raw - really signal HUP upon disconnect
Input: serio_raw - remove stray semicolon
Input: revert some over-zealous conversions to module_platform_driver()
Diffstat (limited to 'drivers/input/touchscreen')
-rw-r--r-- | drivers/input/touchscreen/atmel-wm97xx.c | 13 | ||||
-rw-r--r-- | drivers/input/touchscreen/mc13783_ts.c | 13 |
2 files changed, 24 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/atmel-wm97xx.c b/drivers/input/touchscreen/atmel-wm97xx.c index d016cb26d12..8034cbb20f7 100644 --- a/drivers/input/touchscreen/atmel-wm97xx.c +++ b/drivers/input/touchscreen/atmel-wm97xx.c | |||
@@ -429,7 +429,18 @@ static struct platform_driver atmel_wm97xx_driver = { | |||
429 | .suspend = atmel_wm97xx_suspend, | 429 | .suspend = atmel_wm97xx_suspend, |
430 | .resume = atmel_wm97xx_resume, | 430 | .resume = atmel_wm97xx_resume, |
431 | }; | 431 | }; |
432 | module_platform_driver(atmel_wm97xx_driver); | 432 | |
433 | static int __init atmel_wm97xx_init(void) | ||
434 | { | ||
435 | return platform_driver_probe(&atmel_wm97xx_driver, atmel_wm97xx_probe); | ||
436 | } | ||
437 | module_init(atmel_wm97xx_init); | ||
438 | |||
439 | static void __exit atmel_wm97xx_exit(void) | ||
440 | { | ||
441 | platform_driver_unregister(&atmel_wm97xx_driver); | ||
442 | } | ||
443 | module_exit(atmel_wm97xx_exit); | ||
433 | 444 | ||
434 | MODULE_AUTHOR("Hans-Christian Egtvedt <egtvedt@samfundet.no>"); | 445 | MODULE_AUTHOR("Hans-Christian Egtvedt <egtvedt@samfundet.no>"); |
435 | MODULE_DESCRIPTION("wm97xx continuous touch driver for Atmel AT91 and AVR32"); | 446 | MODULE_DESCRIPTION("wm97xx continuous touch driver for Atmel AT91 and AVR32"); |
diff --git a/drivers/input/touchscreen/mc13783_ts.c b/drivers/input/touchscreen/mc13783_ts.c index 68f86f7dabb..ede02743eac 100644 --- a/drivers/input/touchscreen/mc13783_ts.c +++ b/drivers/input/touchscreen/mc13783_ts.c | |||
@@ -240,7 +240,18 @@ static struct platform_driver mc13783_ts_driver = { | |||
240 | .name = MC13783_TS_NAME, | 240 | .name = MC13783_TS_NAME, |
241 | }, | 241 | }, |
242 | }; | 242 | }; |
243 | module_platform_driver(mc13783_ts_driver); | 243 | |
244 | static int __init mc13783_ts_init(void) | ||
245 | { | ||
246 | return platform_driver_probe(&mc13783_ts_driver, &mc13783_ts_probe); | ||
247 | } | ||
248 | module_init(mc13783_ts_init); | ||
249 | |||
250 | static void __exit mc13783_ts_exit(void) | ||
251 | { | ||
252 | platform_driver_unregister(&mc13783_ts_driver); | ||
253 | } | ||
254 | module_exit(mc13783_ts_exit); | ||
244 | 255 | ||
245 | MODULE_DESCRIPTION("MC13783 input touchscreen driver"); | 256 | MODULE_DESCRIPTION("MC13783 input touchscreen driver"); |
246 | MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>"); | 257 | MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>"); |