aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2010-06-17 19:29:57 +0000
committerHauke Mehrtens <hauke@openwrt.org>2010-06-17 19:29:57 +0000
commit06e250f9d57fcd6772e5f320707eccdb1487aa89 (patch)
tree43abd086673821c1e1fd9b3afadec0a2b1cc78a3
parent75b3a23627c35d4755cc06be378c4bba262f592a (diff)
downloadupstream-06e250f9d57fcd6772e5f320707eccdb1487aa89.tar.gz
upstream-06e250f9d57fcd6772e5f320707eccdb1487aa89.tar.bz2
upstream-06e250f9d57fcd6772e5f320707eccdb1487aa89.zip
compile fixes for kernel 2.6.34
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21829 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/broadcom-wl/patches/001-kernel-2.6.34_compat.patch22
-rw-r--r--package/compcache/patches/002-kernel-2.6.34-compat.patch10
2 files changed, 32 insertions, 0 deletions
diff --git a/package/broadcom-wl/patches/001-kernel-2.6.34_compat.patch b/package/broadcom-wl/patches/001-kernel-2.6.34_compat.patch
new file mode 100644
index 0000000000..1ca362675b
--- /dev/null
+++ b/package/broadcom-wl/patches/001-kernel-2.6.34_compat.patch
@@ -0,0 +1,22 @@
+--- a/driver/include/linuxver.h
++++ b/driver/include/linuxver.h
+@@ -19,8 +19,10 @@
+ #include <linux/version.h>
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0))
+ #include <linux/config.h>
+-#else
++#elif (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34))
+ #include <linux/autoconf.h>
++#else
++#include <generated/autoconf.h>
+ #endif
+ #include <linux/module.h>
+
+@@ -111,7 +113,6 @@ typedef irqreturn_t(*FN_ISR) (int irq, v
+
+ #if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE)
+
+-#include <pcmcia/version.h>
+ #include <pcmcia/cs_types.h>
+ #include <pcmcia/cs.h>
+ #include <pcmcia/cistpl.h>
diff --git a/package/compcache/patches/002-kernel-2.6.34-compat.patch b/package/compcache/patches/002-kernel-2.6.34-compat.patch
new file mode 100644
index 0000000000..5cd8129f80
--- /dev/null
+++ b/package/compcache/patches/002-kernel-2.6.34-compat.patch
@@ -0,0 +1,10 @@
+--- a/ramzswap_drv.c
++++ b/ramzswap_drv.c
+@@ -23,6 +23,7 @@
+ #include <linux/device.h>
+ #include <linux/genhd.h>
+ #include <linux/highmem.h>
++#include <linux/slab.h>
+ #include <linux/string.h>
+ #include <linux/swap.h>
+ #include <linux/swapops.h>