Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.de>2009-07-27 11:08:44 -0400
committerJeff Mahoney <jeffm@suse.de>2009-07-27 11:08:44 -0400
commita2b353e1a07b48000e4936b91f637bcaa738bdf3 (patch)
tree4f39fadd989343161160fa25e2291102ecd7a85c
parentbf8ddbe6a6e7cc27e7f27b6f132de4dac6653e42 (diff)
parenta63652cb800c1536359d0c62e44561261e1e30c8 (diff)
Merge branch 'v2.6.31-branch'
Conflicts: patches.rpmify/rtl8192su-build-fix
-rw-r--r--kernel-source.changes10
-rw-r--r--patches.rpmify/rtl8192su-build-fix20
2 files changed, 20 insertions, 10 deletions
diff --git a/kernel-source.changes b/kernel-source.changes
index 74a29b3e5e..ffcf79e5fc 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -6,6 +6,16 @@ Mon Jul 27 13:43:01 CEST 2009 - mmarek@suse.cz
works for ix86 and x86_64, other archs might need further fixes.
-------------------------------------------------------------------
+Mon Jul 27 03:04:23 CEST 2009 - jeffm@suse.de
+
+- patches.rpmify/rtl8192su-build-fix: more ia64 fixes
+
+-------------------------------------------------------------------
+Mon Jul 27 01:47:21 CEST 2009 - jeffm@suse.de
+
+- patches.rpmify/rtl8192su-build-fix: rtl8192su: compile fixes.
+
+-------------------------------------------------------------------
Mon Jul 27 01:45:37 CEST 2009 - jeffm@suse.de
- patches.rpmify/rtl8192su-build-fix: rtl8192su: compile fixes.
diff --git a/patches.rpmify/rtl8192su-build-fix b/patches.rpmify/rtl8192su-build-fix
index ff1ad02f2e..7100934df7 100644
--- a/patches.rpmify/rtl8192su-build-fix
+++ b/patches.rpmify/rtl8192su-build-fix
@@ -6,8 +6,8 @@ Subject: rtl8192su: compile fixes
Acked-by: Jeff Mahoney <jeffm@suse.com>
---
drivers/staging/rtl8192su/Makefile | 1 -
- drivers/staging/rtl8192su/r8192U_core.c | 22 +++++++---------------
- 2 files changed, 7 insertions(+), 16 deletions(-)
+ drivers/staging/rtl8192su/r8192U_core.c | 22 ++++++++--------------
+ 2 files changed, 8 insertions(+), 15 deletions(-)
--- a/drivers/staging/rtl8192su/Makefile
+++ b/drivers/staging/rtl8192su/Makefile
@@ -21,7 +21,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com>
EXTRA_CFLAGS += -DTHOMAS_BEACON -DTHOMAS_TURBO
--- a/drivers/staging/rtl8192su/r8192U_core.c
+++ b/drivers/staging/rtl8192su/r8192U_core.c
-@@ -24,15 +24,6 @@
+@@ -24,14 +24,7 @@
* Jerry chuang <wlanfae@realtek.com>
*/
@@ -33,11 +33,11 @@ Acked-by: Jeff Mahoney <jeffm@suse.com>
-double __subdf3(double a, double b) { return a-b; }
-double __extendsfdf2(float a) {return a;}
-#endif
--
++#include <linux/vmalloc.h>
+
#undef LOOP_TEST
#undef DUMP_RX
- #undef DUMP_TX
-@@ -1715,7 +1706,7 @@ static int rtl8192_rx_initiate(struct ne
+@@ -1715,7 +1708,7 @@ static int rtl8192_rx_initiate(struct ne
}
// printk("nomal packet IN request!\n");
usb_fill_bulk_urb(entry, priv->udev,
@@ -46,7 +46,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com>
RX_URB_SIZE, rtl8192_rx_isr, skb);
info = (struct rtl8192_rx_info *) skb->cb;
info->urb = entry;
-@@ -1745,7 +1736,7 @@ static int rtl8192_rx_initiate(struct ne
+@@ -1745,7 +1738,7 @@ static int rtl8192_rx_initiate(struct ne
break;
}
usb_fill_bulk_urb(entry, priv->udev,
@@ -55,7 +55,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com>
RX_URB_SIZE, rtl8192_rx_isr, skb);
info = (struct rtl8192_rx_info *) skb->cb;
info->urb = entry;
-@@ -2135,7 +2126,8 @@ static void rtl8192_rx_isr(struct urb *u
+@@ -2135,7 +2128,8 @@ static void rtl8192_rx_isr(struct urb *u
}
usb_fill_bulk_urb(urb, priv->udev,
@@ -65,7 +65,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com>
RX_URB_SIZE, rtl8192_rx_isr, skb);
info = (struct rtl8192_rx_info *) skb->cb;
-@@ -2143,7 +2135,7 @@ static void rtl8192_rx_isr(struct urb *u
+@@ -2143,7 +2137,7 @@ static void rtl8192_rx_isr(struct urb *u
info->dev = dev;
info->out_pipe = out_pipe;
@@ -74,7 +74,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com>
urb->context = skb;
skb_queue_tail(&priv->rx_queue, skb);
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)
-@@ -2356,8 +2348,8 @@ struct sk_buff *DrvAggr_Aggregation(stru
+@@ -2356,8 +2350,8 @@ struct sk_buff *DrvAggr_Aggregation(stru
/* Subframe drv Tx descriptor and firmware info setting */
skb = pSendList->tx_agg_frames[i];
tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);