aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2008-06-30 03:21:25 -0700
committerLuis R. Rodriguez <lrodriguez@atheros.com>2008-06-30 03:21:25 -0700
commitce86f126ec84a90257f489903949ffaefa15a5af (patch)
treeb10bdff32c85efc15f31b5252cf012555b63356c
parent22a4334199290288ab53a6bd7c777e3bdcb54a9d (diff)
downloadcompat-wireless-2.6-old-ce86f126ec84a90257f489903949ffaefa15a5af.tar.gz
RFKILL enum changes will be part of 2.6.27 not 2.6.26 so lets add our first
compat section for kernels <= 2.6.26. Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
-rw-r--r--compat/compat.h16
1 files changed, 10 insertions, 6 deletions
diff --git a/compat/compat.h b/compat/compat.h
index e47e0ec..14f9ef7 100644
--- a/compat/compat.h
+++ b/compat/compat.h
@@ -487,12 +487,6 @@ static inline int list_is_singular(const struct list_head *head)
return !list_empty(head) && (head->next == head->prev);
}
-/* This is from include/linux/rfkill.h */
-#define RFKILL_STATE_SOFT_BLOCKED RFKILL_STATE_OFF
-#define RFKILL_STATE_UNBLOCKED RFKILL_STATE_ON
-/* This one is new */
-#define RFKILL_STATE_HARD_BLOCKED 2
-
/* This is from include/linux/device.h, which was added as of 2.6.26 */
static inline const char *dev_name(struct device *dev)
{
@@ -729,4 +723,14 @@ static inline const char *dev_name(struct device *dev)
#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)) */
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
+
+/* This is from include/linux/rfkill.h */
+#define RFKILL_STATE_SOFT_BLOCKED RFKILL_STATE_OFF
+#define RFKILL_STATE_UNBLOCKED RFKILL_STATE_ON
+/* This one is new */
+#define RFKILL_STATE_HARD_BLOCKED 2
+
+#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)) */
+
#endif /* LINUX_26_COMPAT_H */