diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-11-20 23:46:04 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-11-20 23:46:04 +0300 |
| commit | a69862d8d04e4877965cc938140c9f8e6da0b827 (patch) | |
| tree | 667cace5c2fad872871e4d24d0c895664f0e0bc6 /drivers/soc/versatile/soc-realview.c | |
| parent | 0f32fd1900e6b972f289416dbd75e92772b630cb (diff) | |
| parent | 01cb156edbbd4e6c4fd8db0d05f18c62c424f9aa (diff) | |
| download | linux-a69862d8d04e4877965cc938140c9f8e6da0b827.tar.xz | |
Merge branch 'for-linus' into test/usb-resume
Diffstat (limited to 'drivers/soc/versatile/soc-realview.c')
| -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 cea8ea3491d2..1a07bf540fec 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; |