git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
net
/
irda
/
irda_device.c
diff --git
a/net/irda/irda_device.c
b/net/irda/irda_device.c
index
8e7493f
..
80a6648
100644
(file)
--- a/
net/irda/irda_device.c
+++ b/
net/irda/irda_device.c
@@
-536,7
+536,7
@@
int irda_device_set_mode(struct net_device* dev, int mode)
* Setup the DMA channel. Commonly used by ISA FIR drivers
*
*/
* Setup the DMA channel. Commonly used by ISA FIR drivers
*
*/
-void irda_setup_dma(int channel,
char *
buffer, int count, int mode)
+void irda_setup_dma(int channel,
dma_addr_t
buffer, int count, int mode)
{
unsigned long flags;
{
unsigned long flags;
@@
-545,7
+545,7
@@
void irda_setup_dma(int channel, char *buffer, int count, int mode)
disable_dma(channel);
clear_dma_ff(channel);
set_dma_mode(channel, mode);
disable_dma(channel);
clear_dma_ff(channel);
set_dma_mode(channel, mode);
- set_dma_addr(channel,
isa_virt_to_bus(buffer)
);
+ set_dma_addr(channel,
buffer
);
set_dma_count(channel, count);
enable_dma(channel);
set_dma_count(channel, count);
enable_dma(channel);