diff options
| author | Linus Torvalds | 2015-01-26 16:25:42 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2015-01-26 16:25:42 -0800 |
| commit | 4adca1cbc4cedb31aba03497b3de238ea13b566a (patch) | |
| tree | 7f5e26da972eb9a5653f9c87cb9db471200702bf /drivers | |
| parent | c976a67b02821d324f5e9fffe87e807364fe1a0e (diff) | |
| parent | 45cd15e600ec8006305ce83f62c7208c2cb7a052 (diff) | |
Merge branch 'akpm' (patches from Andrew Morton)
Merge misc fixes from Andrew Morton:
"Six fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
drivers/rtc/rtc-s5m.c: terminate s5m_rtc_id array with empty element
printk: add dummy routine for when CONFIG_PRINTK=n
mm/vmscan: fix highidx argument type
memcg: remove extra newlines from memcg oom kill log
x86, build: replace Perl script with Shell script
mm: page_alloc: embed OOM killing naturally into allocation slowpath
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/rtc/rtc-s5m.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/rtc/rtc-s5m.c b/drivers/rtc/rtc-s5m.c index b5e7c4670205..89ac1d5083c6 100644 --- a/drivers/rtc/rtc-s5m.c +++ b/drivers/rtc/rtc-s5m.c @@ -832,6 +832,7 @@ static SIMPLE_DEV_PM_OPS(s5m_rtc_pm_ops, s5m_rtc_suspend, s5m_rtc_resume); static const struct platform_device_id s5m_rtc_id[] = { { "s5m-rtc", S5M8767X }, { "s2mps14-rtc", S2MPS14X }, + { }, }; static struct platform_driver s5m_rtc_driver = { |