Merge branch 'master' into upstream-fixes

1 files changed, 0 insertions, 3 deletions

diff --git a/arch/sparc64/kernel/devices.c b/arch/sparc64/kernel/devices.c
index f8ef2f2b9b37..ec10f7edcf86 100644
--- a/arch/sparc64/kernel/devices.c
+++ b/arch/sparc64/kernel/devices.c
@@ -66,9 +66,6 @@ static int check_cpu_node(struct device_node *dp, int *cur_inst,
                           void *compare_arg,
                           struct device_node **dev_node, int *mid)
 {
-        if (strcmp(dp->type, "cpu"))
-                return -ENODEV;
-
         if (!compare(dp, *cur_inst, compare_arg)) {
                 if (dev_node)
                         *dev_node = dp;