diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2006-01-12 23:16:43 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 13:25:00 +0100 |
| commit | 8e0a613bf61ccaab376877d7c2ed50315b8ca6d7 (patch) | |
| tree | 76964e5d482023c895487a7392a3e3e18d7dc599 /drivers/net/spider_net.h | |
| parent | [PATCH] spidernet: read firmware from the OF device tree (diff) | |
| download | linux-8e0a613bf61ccaab376877d7c2ed50315b8ca6d7.tar.xz linux-8e0a613bf61ccaab376877d7c2ed50315b8ca6d7.zip | |
[PATCH] spidernet: fix HW structures for 64 bit dma_addr_t
The driver incorrectly used dma_addr_t to describe
HW structures and consequently broke when that type
was changed in 2.6.15-rc.
This changed spidernet to use u32 for 32 bit HW defined
structure elements.
From: Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
Signed-off-by: Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
Signed-off-by: Arnd Bergmann <arndb@de.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net/spider_net.h')
| -rw-r--r-- | drivers/net/spider_net.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/spider_net.h b/drivers/net/spider_net.h index 22b2f2347351..98f11ecf48fc 100644 --- a/drivers/net/spider_net.h +++ b/drivers/net/spider_net.h @@ -373,9 +373,9 @@ enum spider_net_descr_status { struct spider_net_descr { /* as defined by the hardware */ - dma_addr_t buf_addr; + u32 buf_addr; u32 buf_size; - dma_addr_t next_descr_addr; + u32 next_descr_addr; u32 dmac_cmd_status; u32 result_size; u32 valid_size; /* all zeroes for tx */ |