diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2015-09-01 09:35:24 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-09-01 09:35:24 -0400 |
| commit | 067e2601d3c076abbf45db91261f9065eaa879b2 (patch) | |
| tree | 86c8d4b913873dbd3b4ff23562a3a8597984b4df /drivers/of/platform.c | |
| parent | 3e097d1271ecdff2f251a54ddfc5eaa1f9821e96 (diff) | |
| parent | 931830aa5c251e0803523213428f777a48bde254 (diff) | |
Merge branch 'for-4.3/gembird' into for-linus
Diffstat (limited to 'drivers/of/platform.c')
| -rw-r--r-- | drivers/of/platform.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/of/platform.c b/drivers/of/platform.c index a01f57c9e34e..ddf8e42c9367 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | 25 | ||
| 26 | const struct of_device_id of_default_bus_match_table[] = { | 26 | const struct of_device_id of_default_bus_match_table[] = { |
| 27 | { .compatible = "simple-bus", }, | 27 | { .compatible = "simple-bus", }, |
| 28 | { .compatible = "simple-mfd", }, | ||
| 28 | #ifdef CONFIG_ARM_AMBA | 29 | #ifdef CONFIG_ARM_AMBA |
| 29 | { .compatible = "arm,amba-bus", }, | 30 | { .compatible = "arm,amba-bus", }, |
| 30 | #endif /* CONFIG_ARM_AMBA */ | 31 | #endif /* CONFIG_ARM_AMBA */ |