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/sysdev/msi_bitmap.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/sysdev/msi_bitmap.c')
| -rw-r--r-- | arch/powerpc/sysdev/msi_bitmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/msi_bitmap.c b/arch/powerpc/sysdev/msi_bitmap.c index 0968b66b4cf9..8ba60424be95 100644 --- a/arch/powerpc/sysdev/msi_bitmap.c +++ b/arch/powerpc/sysdev/msi_bitmap.c @@ -202,7 +202,7 @@ void __init test_of_node(void) /* There should really be a struct device_node allocator */ memset(&of_node, 0, sizeof(of_node)); - kref_init(&of_node.kref); + kref_init(&of_node.kobj.kref); of_node.full_name = node_name; check(0 == msi_bitmap_alloc(&bmp, size, &of_node)); |