compat-wireless: fix rfkill patches from applying

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>

diff --git a/config.mk b/config.mk
index 99485a4893d184eb649822462999f16026c6097e..ce67176fbacf70e82d1f0f8aec54c2a75ed65f0c 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -626,6 +626,5 @@ CONFIG_RFKILL_BACKPORT=m
 ifdef CONFIG_LEDS_TRIGGERS
 CONFIG_RFKILL_BACKPORT_LEDS=y
 endif #CONFIG_LEDS_TRIGGERS
-CONFIG_RFKILL_BACKPORT_INPUT=y
 endif #CONFIG_COMPAT_KERNEL_31
 

diff --git a/defconfigs/atheros-debug.mk b/defconfigs/atheros-debug.mk
index d9534eb1c90e847048ee816546af541df5f609f4..8850df54650541f42b2777a6ccf8b7481eae695b 100644 (file)
--- a/defconfigs/atheros-debug.mk
+++ b/defconfigs/atheros-debug.mk
@@ -587,6 +587,5 @@ endif #CONFIG_COMPAT_KERNEL_27
 ifdef CONFIG_COMPAT_KERNEL_31
 CONFIG_RFKILL_BACKPORT=m
 CONFIG_RFKILL_BACKPORT_LEDS=y
-CONFIG_RFKILL_BACKPORT_INPUT=y
 endif #CONFIG_COMPAT_KERNEL_31
 

diff --git a/patches/03-rfkill.patch b/patches/03-rfkill.patch
index 051c6f081d63f776512104934d0346053e3e8458..aac6596ec16ab7b6c2660e816db6bebfc8176781 100644 (file)
--- a/patches/03-rfkill.patch
+++ b/patches/03-rfkill.patch
@@ -35,23 +35,11 @@ This would do the policing from within mac80211.
  #
  
 -rfkill-y                      += core.o
--rfkill-$(CONFIG_RFKILL_INPUT) += input.o
 -obj-$(CONFIG_RFKILL)          += rfkill.o
-+rfkill_backport-y                     += core.o
-+rfkill_backport-$(CONFIG_RFKILL_BACKPORT_INPUT)       += input.o
-+obj-$(CONFIG_RFKILL_BACKPORT)         += rfkill_backport.o
++rfkill_backport-y             += core.o
++obj-$(CONFIG_RFKILL_BACKPORT) += rfkill_backport.o
  obj-$(CONFIG_RFKILL_REGULATOR)        += rfkill-regulator.o
---- a/net/rfkill/input.c
-+++ b/net/rfkill/input.c
-@@ -232,7 +232,7 @@ static int rfkill_connect(struct input_h
- 
-       handle->dev = dev;
-       handle->handler = handler;
--      handle->name = "rfkill";
-+      handle->name = "rfkill_backport";
- 
-       /* causes rfkill_start() to be called */
-       error = input_register_handle(handle);
+ obj-$(CONFIG_RFKILL_GPIO)     += rfkill-gpio.o
 --- a/net/rfkill/core.c
 +++ b/net/rfkill/core.c
 @@ -805,7 +805,7 @@ static int rfkill_resume(struct device *