diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-08-05 23:20:42 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-08-05 23:20:42 +0000 |
| commit | 1d75833a6d2c08752643f8de81e967b37065a6b4 (patch) | |
| tree | 57627a5847b21035db48a07ded8387df43ece4ca | |
| parent | 277a5a8f9d3a2c313baa336ae4b215f30a67c40b (diff) | |
fix qc-usb compile on atheros
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12185 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/qc-usb/patches/001-linux_2_6.patch | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/package/qc-usb/patches/001-linux_2_6.patch b/package/qc-usb/patches/001-linux_2_6.patch index d0b8687d30..34c73c4d30 100644 --- a/package/qc-usb/patches/001-linux_2_6.patch +++ b/package/qc-usb/patches/001-linux_2_6.patch @@ -1,6 +1,5 @@ -diff -ruN qc-usb-0.6.6-orig/qc-driver.c qc-usb-0.6.6/qc-driver.c ---- qc-usb-0.6.6-orig/qc-driver.c 2006-10-24 04:06:19.000000000 +0200 -+++ qc-usb-0.6.6/qc-driver.c 2008-04-12 18:01:01.000000000 +0200 +--- a/qc-driver.c ++++ b/qc-driver.c @@ -821,7 +821,9 @@ if (!cr) goto fail2; urb->transfer_buffer = kmalloc(qc_i2c_maxbufsize*sizeof(u8), GFP_KERNEL); /* Allocate maximum ever needed */ @@ -21,3 +20,25 @@ diff -ruN qc-usb-0.6.6-orig/qc-driver.c qc-usb-0.6.6/qc-driver.c minor: -1, #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) release: qc_v4l_release, +--- a/qc-memory.c ++++ b/qc-memory.c +@@ -78,15 +78,19 @@ + #endif + + #if LINUX_VERSION_CODE>=KERNEL_VERSION(2,5,3) || defined(pte_offset_map) ++#ifndef pte_offset + #define pte_offset(pmd,adr) pte_offset_map(pmd,adr) /* Emulation for a kernel using the new rmap-vm */ ++#endif + #endif /* Fix by Michele Balistreri <brain87@gmx.net> */ + ++#ifndef SETPAGEFLAG + #ifndef SetPageReserved + #define SetPageReserved(p) mem_map_reserve(p) + #endif + #ifndef ClearPageReserved + #define ClearPageReserved(p) mem_map_unreserve(p) + #endif ++#endif /* SETPAGEFLAG */ + /* }}} */ + + /* {{{ [fold] kvirt_to_pa(): obtain physical address from virtual address obtained by vmalloc() */ |