From: Luis R. Rodriguez <lrodriguez@atheros.com>
Date: Wed, 8 Jul 2009 00:28:01 +0000 (-0700)
Subject: Forgot to ifdef the inclusion of rfkill_backport.h on rfkill/input.c
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=45cba6dbfc5a0bbcc22e598bca5a9610f0b6de69;p=openwrt%2Fstaging%2Fblogic.git

Forgot to ifdef the inclusion of rfkill_backport.h on rfkill/input.c

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

diff --git a/compat/compat.diff b/compat/compat.diff
index d68270eb9662..d83b521024cf 100644
--- a/compat/compat.diff
+++ b/compat/compat.diff
@@ -747,18 +747,21 @@
  	rfkill_handler_exit();
  #endif
  	misc_deregister(&rfkill_miscdev);
---- a/net/rfkill/input.c
-+++ b/net/rfkill/input.c
-@@ -17,7 +17,7 @@
+--- a/net/rfkill/input.c	2009-07-07 17:27:09.290706860 -0700
++++ b/net/rfkill/input.c	2009-07-07 17:26:57.195684653 -0700
+@@ -17,7 +17,11 @@
  #include <linux/slab.h>
  #include <linux/workqueue.h>
  #include <linux/init.h>
--#include <linux/rfkill.h>
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31))
+ #include <linux/rfkill.h>
++#else
 +#include <linux/rfkill_backport.h>
++#endif
  #include <linux/sched.h>
  
  #include "rfkill.h"
-@@ -229,7 +229,7 @@ static int rfkill_connect(struct input_handler *handler, struct input_dev *dev,
+@@ -229,7 +233,7 @@ static int rfkill_connect(struct input_h
  
  	handle->dev = dev;
  	handle->handler = handler;