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 /arch/powerpc/platforms/pseries/reconfig.c | |
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 'arch/powerpc/platforms/pseries/reconfig.c')
-rw-r--r-- | arch/powerpc/platforms/pseries/reconfig.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c index f93cdf55628c..0435bb65d0aa 100644 --- a/arch/powerpc/platforms/pseries/reconfig.c +++ b/arch/powerpc/platforms/pseries/reconfig.c @@ -12,7 +12,6 @@ */ #include <linux/kernel.h> -#include <linux/kref.h> #include <linux/notifier.h> #include <linux/proc_fs.h> #include <linux/slab.h> @@ -70,7 +69,6 @@ static int pSeries_reconfig_add_node(const char *path, struct property *proplist np->properties = proplist; of_node_set_flag(np, OF_DYNAMIC); - kref_init(&np->kref); np->parent = derive_parent(path); if (IS_ERR(np->parent)) { |