diff options
author | Johannes Berg <johannes.berg@intel.com> | 2014-05-09 08:23:16 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-06-18 21:43:45 +0200 |
commit | c58f17a5ebadcc75598e8089c72f39b2f24f0bde (patch) | |
tree | 6dc48c1b07402ad3bf24ac8c9994bdbc5f53b0d8 /patches | |
parent | 3763431984135c799ff8bd6fd479d12a41e5cef0 (diff) |
backports: fix class/bus attribute group spatch conversion
Upstream commit: 495b6d7968e4ce08fb1371197bce7a8c8a482069
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 <johannes.berg@intel.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches')
-rw-r--r-- | patches/collateral-evolutions/generic/0001-group-attr/0001-group_attr_class.cocci | 4 | ||||
-rw-r--r-- | patches/collateral-evolutions/generic/0001-group-attr/0002-group_attr_bus.cocci | 4 |
2 files changed, 0 insertions, 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 fa700f82..ea2e7039 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 d4ae44c7..b01da875 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); ) |