From: Johannes Berg <[email protected]> The spatch conversion (commit 05d44557c6a83b4ecb935cb6306f62, "backports: transform group attribute backport to SmPL form") added an #ifdef that shouldn't be there - remove it.
Signed-off-by: Johannes Berg <[email protected]> --- .../generic/0001-group-attr/0001-group_attr_class.cocci | 4 ---- .../generic/0001-group-attr/0002-group_attr_bus.cocci | 4 ---- 2 files changed, 8 deletions(-) diff --git a/patches/collateral-evolutions/generic/0001-group-attr/0001-group_attr_class.cocci b/patches/collateral-evolutions/generic/0001-group-attr/0001-group_attr_class.cocci index fa700f82db77..ea2e7039f50c 100644 --- a/patches/collateral-evolutions/generic/0001-group-attr/0001-group_attr_class.cocci +++ b/patches/collateral-evolutions/generic/0001-group-attr/0001-group_attr_class.cocci @@ -66,13 +66,9 @@ fresh identifier group_class_init = "init_" ## attribute_group_mod.group ## "_at @@ ( -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0) + group_class_init(); -+#endif return class_register(&group_class); | -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0) + group_class_init(); -+#endif ret = class_register(&group_class); ) diff --git a/patches/collateral-evolutions/generic/0001-group-attr/0002-group_attr_bus.cocci b/patches/collateral-evolutions/generic/0001-group-attr/0002-group_attr_bus.cocci index d4ae44c7dfa3..b01da875083b 100644 --- a/patches/collateral-evolutions/generic/0001-group-attr/0002-group_attr_bus.cocci +++ b/patches/collateral-evolutions/generic/0001-group-attr/0002-group_attr_bus.cocci @@ -64,14 +64,10 @@ fresh identifier group_bus_init = "init_" ## attribute_group_mod.group ## "_attr @@ ( -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0) + group_bus_init(); -+#endif return bus_register(&group_bus); | -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0) + group_bus_init(); -+#endif ret = bus_register(&group_bus); ) -- 2.0.0.rc0 -- To unsubscribe from this list: send the line "unsubscribe backports" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
