diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-12-16 17:33:49 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-12-16 17:33:49 (GMT) |
| commit | ee1156c11a1121e118b0a7f2dec240f0d421b1fd (patch) | |
| tree | b8771cc5a9758af9d7410fc519227c036c222130 /drivers/input/misc/bfin_rotary.c | |
| parent | b9f8fcd55bbdb037e5332dbdb7b494f0b70861ac (diff) | |
| parent | 8bea8672edfca7ec5f661cafb218f1205863b343 (diff) | |
| download | linux-fsl-qoriq-ee1156c11a1121e118b0a7f2dec240f0d421b1fd.tar.xz | |
Merge branch 'linus' into sched/urgent
Conflicts:
kernel/sched_idletask.c
Merge reason: resolve the conflicts, pick up latest changes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/input/misc/bfin_rotary.c')
| -rw-r--r-- | drivers/input/misc/bfin_rotary.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/bfin_rotary.c b/drivers/input/misc/bfin_rotary.c index 690f3fa..61d1017 100644 --- a/drivers/input/misc/bfin_rotary.c +++ b/drivers/input/misc/bfin_rotary.c @@ -247,7 +247,7 @@ static int bfin_rotary_resume(struct device *dev) return 0; } -static struct dev_pm_ops bfin_rotary_pm_ops = { +static const struct dev_pm_ops bfin_rotary_pm_ops = { .suspend = bfin_rotary_suspend, .resume = bfin_rotary_resume, }; |