Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge branch 'for-next' of git://www.jni.nu/cris into cris_merge

+2 -2
+2 -2
include/asm-cris/arch-v32/io.h
··· 43 43 44 44 static inline void crisv32_io_set(struct crisv32_iopin *iopin, int val) 45 45 { 46 - long flags; 46 + unsigned long flags; 47 47 spin_lock_irqsave(&iopin->port->lock, flags); 48 48 49 49 if (val) ··· 57 57 static inline void crisv32_io_set_dir(struct crisv32_iopin* iopin, 58 58 enum crisv32_io_dir dir) 59 59 { 60 - long flags; 60 + unsigned long flags; 61 61 spin_lock_irqsave(&iopin->port->lock, flags); 62 62 63 63 if (dir == crisv32_io_dir_in)