diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-19 20:02:01 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-19 20:02:01 -0400 |
| commit | 10ce3cc919f50c2043b41ca968b43c26a3672600 (patch) | |
| tree | ea409366a5208aced495bc0516a08b81fd43222e /drivers/input/touchscreen/ad7879-spi.c | |
| parent | 24e3e5ae1e4c2a3a32f5b1f96b4e3fd721806acd (diff) | |
| parent | 5c6a7a62c130afef3d61c1dee153012231ff5cd9 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/touchscreen/ad7879-spi.c')
| -rw-r--r-- | drivers/input/touchscreen/ad7879-spi.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/input/touchscreen/ad7879-spi.c b/drivers/input/touchscreen/ad7879-spi.c index 9b2e1c2b1971..db49abf056ba 100644 --- a/drivers/input/touchscreen/ad7879-spi.c +++ b/drivers/input/touchscreen/ad7879-spi.c | |||
| @@ -157,17 +157,7 @@ static struct spi_driver ad7879_spi_driver = { | |||
| 157 | .remove = __devexit_p(ad7879_spi_remove), | 157 | .remove = __devexit_p(ad7879_spi_remove), |
| 158 | }; | 158 | }; |
| 159 | 159 | ||
| 160 | static int __init ad7879_spi_init(void) | 160 | module_spi_driver(ad7879_spi_driver); |
| 161 | { | ||
| 162 | return spi_register_driver(&ad7879_spi_driver); | ||
| 163 | } | ||
| 164 | module_init(ad7879_spi_init); | ||
| 165 | |||
| 166 | static void __exit ad7879_spi_exit(void) | ||
| 167 | { | ||
| 168 | spi_unregister_driver(&ad7879_spi_driver); | ||
| 169 | } | ||
| 170 | module_exit(ad7879_spi_exit); | ||
| 171 | 161 | ||
| 172 | MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>"); | 162 | MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>"); |
| 173 | MODULE_DESCRIPTION("AD7879(-1) touchscreen SPI bus driver"); | 163 | MODULE_DESCRIPTION("AD7879(-1) touchscreen SPI bus driver"); |