From: "Luis R. Rodriguez" <[email protected]> We want to backport rfkill now for < v3.10 to enable NFC rfkill support. This is required as of next-20130423.
commit 44b3decb414919760c7327df05e63372c1bf5d9a Author: Samuel Ortiz <[email protected]> Date: Thu Apr 11 11:51:36 2013 +0200 rfkill: Add NFC to the list of supported radios And return the proper string for it. Acked-by: Johannes Berg <[email protected]> Acked-by: Marcel Holtmann <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]> Signed-off-by: Luis R. Rodriguez <[email protected]> --- backport/backport-include/linux/rfkill.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/backport/backport-include/linux/rfkill.h b/backport/backport-include/linux/rfkill.h index 01d18f1..3869bbf 100644 --- a/backport/backport-include/linux/rfkill.h +++ b/backport/backport-include/linux/rfkill.h @@ -2,10 +2,8 @@ #define __COMPAT_RFKILL_H #include <linux/version.h> -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) -#include_next <linux/rfkill.h> -#else -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) +#if (LINUX_VERSION_CODE > KERNEL_VERSION(3,10,0)) + #define rfkill_get_led_trigger_name LINUX_BACKPORT(rfkill_get_led_trigger_name) #define rfkill_set_led_trigger_name LINUX_BACKPORT(rfkill_set_led_trigger_name) #define rfkill_set_hw_state LINUX_BACKPORT(rfkill_set_hw_state) @@ -19,8 +17,11 @@ #define rfkill_register LINUX_BACKPORT(rfkill_register) #define rfkill_unregister LINUX_BACKPORT(rfkill_unregister) #define rfkill_destroy LINUX_BACKPORT(rfkill_destroy) -#endif + #include <linux/rfkill_backport.h> + +#else +#include_next <linux/rfkill.h> #endif #endif -- 1.7.10.4 -- 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
