diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-26 02:11:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-26 02:11:25 -0400 |
| commit | 14eabf70c82cade5dbc71d2e913d533193a91785 (patch) | |
| tree | 53bdf1534f73c59fe8ae796f660cab541a20224c /drivers/net/defxx.c | |
| parent | f49e1aa133c2c9b74b5dfddca8863609bbda9086 (diff) | |
| parent | 2f4489112896770d66dc2960f71174d69ee23004 (diff) | |
Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/defxx.c')
| -rw-r--r-- | drivers/net/defxx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/defxx.c b/drivers/net/defxx.c index ddc30c4bf34a..c062aacf229c 100644 --- a/drivers/net/defxx.c +++ b/drivers/net/defxx.c | |||
| @@ -971,7 +971,8 @@ static int __devinit dfx_driver_init(struct net_device *dev, | |||
| 971 | int alloc_size; /* total buffer size needed */ | 971 | int alloc_size; /* total buffer size needed */ |
| 972 | char *top_v, *curr_v; /* virtual addrs into memory block */ | 972 | char *top_v, *curr_v; /* virtual addrs into memory block */ |
| 973 | dma_addr_t top_p, curr_p; /* physical addrs into memory block */ | 973 | dma_addr_t top_p, curr_p; /* physical addrs into memory block */ |
| 974 | u32 data, le32; /* host data register value */ | 974 | u32 data; /* host data register value */ |
| 975 | __le32 le32; | ||
| 975 | char *board_name = NULL; | 976 | char *board_name = NULL; |
| 976 | 977 | ||
| 977 | DBG_printk("In dfx_driver_init...\n"); | 978 | DBG_printk("In dfx_driver_init...\n"); |