diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-12-09 01:39:29 (GMT) |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-12-09 01:39:29 (GMT) |
| commit | ba00410b8131b23edfb0e09f8b6dd26c8eb621fb (patch) | |
| tree | c08504e4d2fa51ac91cef544f336d0169806c49f /drivers/soc | |
| parent | 8ce74dd6057832618957fc2cbd38fa959c3a0a6c (diff) | |
| parent | aa583096d9767892983332e7c1a984bd17e3cd39 (diff) | |
| download | linux-ba00410b8131b23edfb0e09f8b6dd26c8eb621fb.tar.xz | |
Merge branch 'iov_iter' into for-next
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/versatile/soc-realview.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/soc/versatile/soc-realview.c b/drivers/soc/versatile/soc-realview.c index cea8ea3..1a07bf5 100644 --- a/drivers/soc/versatile/soc-realview.c +++ b/drivers/soc/versatile/soc-realview.c @@ -26,6 +26,7 @@ static const struct of_device_id realview_soc_of_match[] = { { .compatible = "arm,realview-pb11mp-soc", }, { .compatible = "arm,realview-pba8-soc", }, { .compatible = "arm,realview-pbx-soc", }, + { } }; static u32 realview_coreid; |