From 157c888f6c6e289dacad6f19e596b4557bea9646 Mon Sep 17 00:00:00 2001
From: Andrea Adami <andrea.adami@gmail.com>
Date: Sun, 22 Nov 2009 01:05:14 +0100
Subject: opie-networksettings: unbreak builds against *actual* linux-2.6.31
 headers.

Acked-by: Paul Eggleton <bluelightning@bluelightning.org>
---
 recipes/opie-networksettings/files/wireless.patch     | 16 +++++++---------
 recipes/opie-networksettings/opie-networksettings.inc |  2 ++
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'recipes/opie-networksettings')

diff --git a/recipes/opie-networksettings/files/wireless.patch b/recipes/opie-networksettings/files/wireless.patch
index 5d8d42af58..001a310ed4 100644
--- a/recipes/opie-networksettings/files/wireless.patch
+++ b/recipes/opie-networksettings/files/wireless.patch
@@ -1,13 +1,11 @@
-diff --git a/wlan/wextensions.h b/wlan/wextensions.h
-index a89e33a..356aada 100644
---- a/wlan/wextensions.h
-+++ b/wlan/wextensions.h
-@@ -4,6 +4,8 @@
+--- a/wlan/wextensions.h	2009-11-22 00:29:50.000000000 +0100
++++ b/wlan/wextensions.h	2009-11-07 00:53:29.000000000 +0100
+@@ -3,7 +3,7 @@
+ 
  #include <qstring.h>
  
+-#include <net/if.h>
++//#include <net/if.h>
  #include <netinet/ip.h>
-+#include <linux/if.h>
-+#include <linux/types.h>
+ #include <linux/types.h>
  #include <linux/wireless.h>
- 
- class WExtensions {
diff --git a/recipes/opie-networksettings/opie-networksettings.inc b/recipes/opie-networksettings/opie-networksettings.inc
index e84f9da144..8bda9f0b59 100644
--- a/recipes/opie-networksettings/opie-networksettings.inc
+++ b/recipes/opie-networksettings/opie-networksettings.inc
@@ -5,6 +5,8 @@ LICENSE = "GPL"
 PROVIDES = "opie-networksettings-pppplugin opie-networksettings-wlanplugin"
 APPNAME = "networksettings"
 
+SRC_URI_append = " file://wireless.patch;patch=1"
+
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
-- 
cgit 1.2.3-korg