dave, please apply the following to the 2.6 and 2.4 trees.
thanks!
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.1549 -> 1.1550
# drivers/atm/idt77252.c 1.21 -> 1.22
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 04/02/04 chas@xxxxxxxxxxxxxxxxxxxxxx 1.1550
# [ATM]: [idt77252] fix dma_addr_t type error with CONFIG_HIGHMEM64G=y (by
"Randy.Dunlap" <rddunlap@xxxxxxxx>)
# --------------------------------------------
#
diff -Nru a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
--- a/drivers/atm/idt77252.c Wed Feb 4 13:24:55 2004
+++ b/drivers/atm/idt77252.c Wed Feb 4 13:24:55 2004
@@ -664,8 +664,8 @@
skb_queue_head_init(&scq->transmit);
skb_queue_head_init(&scq->pending);
- TXPRINTK("idt77252: SCQ: base 0x%p, next 0x%p, last 0x%p, paddr %08x\n",
- scq->base, scq->next, scq->last, scq->paddr);
+ TXPRINTK("idt77252: SCQ: base 0x%p, next 0x%p, last 0x%p, paddr
%08llx\n",
+ scq->base, scq->next, scq->last, (unsigned long
long)scq->paddr);
return scq;
}
|