Merge branch 'master' into can-usb1

diff --git a/lincan/include/can_sysdep.h b/lincan/include/can_sysdep.h
index 100968987d91a187d6b8a65abd9456aac682f122..b4ffff5f0edbb654887b75ed74c51b8e73eb343d 100644 (file)
--- a/lincan/include/can_sysdep.h
+++ b/lincan/include/can_sysdep.h
@@ -161,20 +161,20 @@
    #define can_ulong2ioptr(addr)   ((unsigned long)(addr))
    #define can_inb(ioaddr) inb(ioaddr)
    #define can_outb(data,ioaddr) outb(data,ioaddr)
-   #define can_inw(ioaddr) inb(ioaddr)
-   #define can_outw(data,ioaddr) outb(data,ioaddr)
-   #define can_inl(ioaddr) inb(ioaddr)
-   #define can_outl(data,ioaddr) outb(data,ioaddr)
+   #define can_inw(ioaddr) inw(ioaddr)
+   #define can_outw(data,ioaddr) outw(data,ioaddr)
+   #define can_inl(ioaddr) inl(ioaddr)
+   #define can_outl(data,ioaddr) outl(data,ioaddr)
 #else /* >=2.6.9 */
    typedef void __iomem * can_ioptr_t;
    #define can_ioptr2ulong(ioaddr) ((unsigned long __force)(ioaddr))
    #define can_ulong2ioptr(addr)   ((can_ioptr_t)(addr))
    #define can_inb(ioaddr) inb(can_ioptr2ulong(ioaddr))
    #define can_outb(data,ioaddr) outb(data,can_ioptr2ulong(ioaddr))
-   #define can_inw(ioaddr) inb(can_ioptr2ulong(ioaddr))
-   #define can_outw(data,ioaddr) outb(data,can_ioptr2ulong(ioaddr))
-   #define can_inl(ioaddr) inb(can_ioptr2ulong(ioaddr))
-   #define can_outl(data,ioaddr) outb(data,can_ioptr2ulong(ioaddr))
+   #define can_inw(ioaddr) inw(can_ioptr2ulong(ioaddr))
+   #define can_outw(data,ioaddr) outw(data,can_ioptr2ulong(ioaddr))
+   #define can_inl(ioaddr) inl(can_ioptr2ulong(ioaddr))
+   #define can_outl(data,ioaddr) outl(data,can_ioptr2ulong(ioaddr))
 #endif
 
 #define can_readb  readb