diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2010-06-17 19:29:57 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2010-06-17 19:29:57 +0000 |
| commit | 247b1ff93e7bf0eaf41201d98ad3d3a077a120c4 (patch) | |
| tree | dcdc188222b79cddd687968f8e6b929d0a0cdc7c | |
| parent | 27e4cb3628c457253dc47b9ca9201ef89f1a456b (diff) | |
| download | upstream-247b1ff93e7bf0eaf41201d98ad3d3a077a120c4.tar.gz upstream-247b1ff93e7bf0eaf41201d98ad3d3a077a120c4.tar.bz2 upstream-247b1ff93e7bf0eaf41201d98ad3d3a077a120c4.zip | |
compile fixes for kernel 2.6.34
SVN-Revision: 21829
| -rw-r--r-- | package/broadcom-wl/patches/001-kernel-2.6.34_compat.patch | 22 | ||||
| -rw-r--r-- | package/compcache/patches/002-kernel-2.6.34-compat.patch | 10 |
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> |