diff options
| author | Robert Marklund <robert.marklund@stericsson.com> | 2011-06-23 13:29:03 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:15:41 +0200 |
| commit | 827eea4c88708d0f822391e4828de20f416cccef (patch) | |
| tree | d4749cf7133d553dfbda2d5faad1fd75dda8433d /drivers | |
| parent | 77cb98e19cdbabaf8bfeb6cf8d774750c19cc7e6 (diff) | |
hsi: ste_hsi: Fix merge problems merge with original commit.
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hsi/controllers/ste_hsi.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/hsi/controllers/ste_hsi.c b/drivers/hsi/controllers/ste_hsi.c index c87def20a3b..8ac1363c14c 100644 --- a/drivers/hsi/controllers/ste_hsi.c +++ b/drivers/hsi/controllers/ste_hsi.c @@ -1684,16 +1684,15 @@ static int __init ste_hsi_init(void) { return platform_driver_probe(&ste_hsi_driver, ste_hsi_probe); } - module_init(ste_hsi_init) static void __exit ste_hsi_exit(void) { platform_driver_unregister(&ste_hsi_driver); } - module_exit(ste_hsi_exit) - MODULE_AUTHOR("Lukasz Baj <lukasz.baj@tieto.com") - MODULE_DESCRIPTION("STE HSI driver.") - MODULE_LICENSE("GPL") +MODULE_AUTHOR("Lukasz Baj <lukasz.baj@tieto.com"); +MODULE_DESCRIPTION("STE HSI driver."); +MODULE_LICENSE("GPL"); + |