From ae2b01e80a260732811ee3c61c6dcce3a03dec25 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 14 Jan 2011 17:51:11 -0800 Subject: [PATCH] --- yaml --- r: 231623 b: refs/heads/master c: 96a608a4bfd8468c21881b3f92024923886eb015 h: refs/heads/master i: 231621: 11975d077469d4229f095b783371a2fbd5348b72 231619: 68f249fe5e4b43bafb3524c0b871ce3168243b20 231615: 5e0b01ff7e88e72ad30963d349a1c85567e394a3 v: v3 --- [refs] | 2 +- trunk/include/linux/amba/pl08x.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 208e5f61b8a6..7673888c3154 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98d530fe246b65fbd3cdeeeca319a80c46cb4793 +refs/heads/master: 96a608a4bfd8468c21881b3f92024923886eb015 diff --git a/trunk/include/linux/amba/pl08x.h b/trunk/include/linux/amba/pl08x.h index 933b4ed12be5..5b87b6aac3f8 100644 --- a/trunk/include/linux/amba/pl08x.h +++ b/trunk/include/linux/amba/pl08x.h @@ -118,7 +118,7 @@ struct pl08x_txd { dma_addr_t dst_addr; size_t len; dma_addr_t llis_bus; - void *llis_va; + struct pl08x_lli *llis_va; bool active; /* Default cctl value for LLIs */ u32 cctl;