This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / net / tokenring / lanstreamer.c

diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c
index d90a283..dcf7f3e 100644 (file)
--- a/drivers/net/tokenring/lanstreamer.c
+++ b/drivers/net/tokenring/lanstreamer.c
@@ -120,12 +120,12 @@
 #include <linux/pci.h>
 #include <linux/spinlock.h>
 #include <linux/version.h>
-#include <linux/bitops.h>
 
 #include <net/checksum.h>
 
 #include <asm/io.h>
 #include <asm/system.h>
+#include <asm/bitops.h>
 
 #include "lanstreamer.h"
 
@@ -1606,7 +1606,7 @@ static void streamer_arb_cmd(struct net_device *dev)
                                i += 2;
                        }
 
-                       memcpy(skb_put(mac_frame, buffer_len),
+                       memcpy_fromio(skb_put(mac_frame, buffer_len),
                                      frame_data, buffer_len);
                } while (next_ptr && (buff_off = next_ptr));