diff options
| author |   José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-11 10:41:07 +0300 |
|---|---|---|
| committer | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-13 08:17:18 +0300 |
| commit | e09b41010ba33a20a87472ee821fa407a5b8da36 (patch) | |
| tree | d10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/drivers/misc/lis3lv02d | |
| parent | f93b97fd65072de626c074dbe099a1fff05ce060 (diff) | |
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
are taken from kernel.org, and rt patch from the rt wiki download page.
During the rebasing, the following patch collided:
Force tick interrupt and get rid of softirq magic(I70131fb85).
Collisions have been removed because its logic was found on the
source already.
Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769
Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/drivers/misc/lis3lv02d')
| -rw-r--r-- | kernel/drivers/misc/lis3lv02d/lis3lv02d.c | 2 | ||||
| -rw-r--r-- | kernel/drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 1 | ||||
| -rw-r--r-- | kernel/drivers/misc/lis3lv02d/lis3lv02d_spi.c | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/kernel/drivers/misc/lis3lv02d/lis3lv02d.c b/kernel/drivers/misc/lis3lv02d/lis3lv02d.c index 4739689d2..fb8705fc3 100644 --- a/kernel/drivers/misc/lis3lv02d/lis3lv02d.c +++ b/kernel/drivers/misc/lis3lv02d/lis3lv02d.c @@ -115,7 +115,7 @@ static int param_set_axis(const char *val, const struct kernel_param *kp) return ret; } -static struct kernel_param_ops param_ops_axis = { +static const struct kernel_param_ops param_ops_axis = { .set = param_set_axis, .get = param_get_int, }; diff --git a/kernel/drivers/misc/lis3lv02d/lis3lv02d_i2c.c b/kernel/drivers/misc/lis3lv02d/lis3lv02d_i2c.c index e3e7f1dc2..0c3bb7e3e 100644 --- a/kernel/drivers/misc/lis3lv02d/lis3lv02d_i2c.c +++ b/kernel/drivers/misc/lis3lv02d/lis3lv02d_i2c.c @@ -274,7 +274,6 @@ static const struct dev_pm_ops lis3_pm_ops = { static struct i2c_driver lis3lv02d_i2c_driver = { .driver = { .name = DRV_NAME, - .owner = THIS_MODULE, .pm = &lis3_pm_ops, .of_match_table = of_match_ptr(lis3lv02d_i2c_dt_ids), }, diff --git a/kernel/drivers/misc/lis3lv02d/lis3lv02d_spi.c b/kernel/drivers/misc/lis3lv02d/lis3lv02d_spi.c index b2f6e1651..e57547512 100644 --- a/kernel/drivers/misc/lis3lv02d/lis3lv02d_spi.c +++ b/kernel/drivers/misc/lis3lv02d/lis3lv02d_spi.c @@ -138,7 +138,6 @@ static SIMPLE_DEV_PM_OPS(lis3lv02d_spi_pm, lis3lv02d_spi_suspend, static struct spi_driver lis302dl_spi_driver = { .driver = { .name = DRV_NAME, - .owner = THIS_MODULE, .pm = &lis3lv02d_spi_pm, .of_match_table = of_match_ptr(lis302dl_spi_dt_ids), }, |