Forgot to remove one more hunk in rfkill backport simplification
authorLuis R. Rodriguez <lrodriguez@atheros.com>
Tue, 7 Jul 2009 23:38:04 +0000 (16:38 -0700)
committerLuis R. Rodriguez <lrodriguez@atheros.com>
Tue, 7 Jul 2009 23:38:04 +0000 (16:38 -0700)
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
compat/compat.diff

index dcbde26266b4d76c754488e4973dffd9bcad25e8..d68270eb9662a453a2ae1523f5328263816059d0 100644 (file)
 +rfkill_backport-y                     += core.o
 +rfkill_backport-$(CONFIG_RFKILL_BACKPORT_INPUT)       += input.o
 +obj-$(CONFIG_RFKILL_BACKPORT)         += rfkill_backport.o
---- a/net/rfkill/core.c        2009-07-07 16:29:01.419679544 -0700
-+++ b/net/rfkill/core.c        2009-07-07 16:28:14.298778487 -0700
+--- a/net/rfkill/core.c        2009-07-07 16:36:36.087678337 -0700
++++ b/net/rfkill/core.c        2009-07-07 16:36:22.462708547 -0700
 @@ -26,7 +26,7 @@
  #include <linux/capability.h>
  #include <linux/list.h>
  static atomic_t rfkill_input_disabled = ATOMIC_INIT(0);
  
  /**
-@@ -753,13 +753,13 @@ static int rfkill_resume(struct device *
-               rfkill_set_block(rfkill, cur);
-       }
--      rfkill_resume_polling(rfkill);
-+      backport_rfkill_resume_polling(rfkill);
-       return 0;
+@@ -759,7 +759,7 @@ static int rfkill_resume(struct device *
  }
  
  static struct class rfkill_class = {