The patch titled
fix tiacx on alpha
has been added to the -mm tree. Its filename is
fix-tiacx-on-alpha.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: fix tiacx on alpha
From: Denis Vlasenko <vda@xxxxxxxxxxxxx>
Signed-off-by: Denis Vlasenko <vda@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/wireless/tiacx/pci.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff -puN drivers/net/wireless/tiacx/pci.c~fix-tiacx-on-alpha drivers/net/wireless/tiacx/pci.c
--- devel/drivers/net/wireless/tiacx/pci.c~fix-tiacx-on-alpha 2006-05-18 12:21:33.000000000 -0700
+++ devel-akpm/drivers/net/wireless/tiacx/pci.c 2006-05-18 12:21:33.000000000 -0700
@@ -50,6 +50,7 @@
#include <linux/pci.h>
#include <linux/pm.h>
#include <linux/vmalloc.h>
+#include <asm/dma-mapping.h>
#include "acx.h"
@@ -3962,12 +3963,16 @@ acxpci_s_proc_diag_output(char *p, acx_d
"rxdesc_start %p\n"
"rxhostdesc_start %p, rxhostdesc_area_size %u, rxhostdesc_startphy %08llx\n"
"rxbuf_start %p, rxbuf_area_size %u, rxbuf_startphy %08llx\n",
- adev->txbuf_start, adev->txbuf_area_size, (u64)adev->txbuf_startphy,
+ adev->txbuf_start, adev->txbuf_area_size,
+ (unsigned long long)adev->txbuf_startphy,
adev->txdesc_size, adev->txdesc_start,
- adev->txhostdesc_start, adev->txhostdesc_area_size, (u64)adev->txhostdesc_startphy,
+ adev->txhostdesc_start, adev->txhostdesc_area_size,
+ (unsigned long long)adev->txhostdesc_startphy,
adev->rxdesc_start,
- adev->rxhostdesc_start, adev->rxhostdesc_area_size, (u64)adev->rxhostdesc_startphy,
- adev->rxbuf_start, adev->rxbuf_area_size, (u64)adev->rxbuf_startphy);
+ adev->rxhostdesc_start, adev->rxhostdesc_area_size,
+ (unsigned long long)adev->rxhostdesc_startphy,
+ adev->rxbuf_start, adev->rxbuf_area_size,
+ (unsigned long long)adev->rxbuf_startphy);
FN_EXIT0;
return p;
_
Patches currently in -mm which might be from vda@xxxxxxxxxxxxx are
aic7xxx-deinline-large-functions-save-80k-of-text.patch
aic7xxx-s-__inline-inline.patch
acx1xx-wireless-driver.patch
fix-tiacx-on-alpha.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
