Merge http://gkernel.bkbits.net/misc-2.5

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

include/asm-i386/io.h

@@ -370,6 +370,6 @@ static inline void ins##bwl(int port, void *addr, unsigned long count) { \
 
 BUILDIO(b,b,char)
 BUILDIO(w,w,short)
-BUILDIO(l,,long)
+BUILDIO(l,,int)
 
 #endif