always use included rfkill

This isn't really desirable, but for now fixes build on
some kernels.

What we really should do is rename all the rfkill to be
backport symbols, and use it only on kernels that didn't
have a usable rfkill. OTOH, on new kernels one may want
to use a backported rfkill if the base configuration
doesn't include it?

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>

diff --git a/compat/include/linux/rfkill.h b/compat/include/linux/rfkill.h
index d615ac9f5b73be66ea2050b709010257dab14c56..a67e13ee781d9938d80993a12e4156f12c9bd13a 100644 (file)
--- a/compat/include/linux/rfkill.h
+++ b/compat/include/linux/rfkill.h
@@ -2,31 +2,9 @@
 #define __COMPAT_RFKILL_H
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31))
-
 #include_next <linux/rfkill.h>
-
 #else
-
-#include <linux/compat-2.6.h>
-
-#undef CONFIG_RFKILL
-#undef CONFIG_RFKILL_INPUT
-#undef CONFIG_RFKILL_LEDS
-
-#ifdef CONFIG_RFKILL_BACKPORT
-#define CONFIG_RFKILL 1
-#endif
-
-#ifdef CONFIG_RFKILL_BACKPORT_INPUT
-#define CONFIG_RFKILL_INPUT
-#endif
-
-#ifdef CONFIG_RFKILL_BACKPORT_LEDS
-#define CONFIG_RFKILL_LEDS
-#endif
-
 #include <linux/rfkill_backport.h>
-
 #endif
 
 #endif