diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-21 00:13:43 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-21 00:13:43 +0900 |
| commit | 21d7f14b70fed254222a24e124e8771e1437be4c (patch) | |
| tree | 3c52e48b28d5675bafa005e061b5639966671ca3 /drivers/base | |
| parent | eff6a902ff6b8a42f768c4b78fc63b9b8d0a41d9 (diff) | |
| parent | 2ea8f7ea87f24735c49543c7f523919295028c58 (diff) | |
Merge branch 'lsk/v3.14/topic/of' into linux-linaro-lsk-v3.14lsk-v3.14-15.02lsk-v3.14-14.02
Conflicts:
drivers/of/Kconfig
drivers/of/Makefile
drivers/of/address.c
drivers/of/selftest.c
include/linux/of.h
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/platform.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 9dbf4ef2b2a3..e988313ece30 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -947,6 +947,7 @@ int __init platform_bus_init(void) error = bus_register(&platform_bus_type); if (error) device_unregister(&platform_bus); + of_platform_register_reconfig_notifier(); return error; } |