From: ppisa Date: Fri, 30 Jan 2009 18:47:04 +0000 (+0100) Subject: Merge branch 'master' into can-usb1 X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/commitdiff_plain/a35b5224bbdfbd7147e1cf715c2931a2d740f592?hp=16f2e763cd09275c174c540c3044eab7cc90e0bc Merge branch 'master' into can-usb1 --- diff --git a/lincan/include/can_sysdep.h b/lincan/include/can_sysdep.h index 1009689..b4ffff5 100644 --- 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