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

git-mirror · Oct 29, 2008 · 242bfaf · 242bfaf
2 parents 1d63e72 + a54373e
commit 242bfaf
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/include/asm-cris/arch-v32/io.h b/include/asm-cris/arch-v32/io.h
@@ -43,7 +43,7 @@ extern struct crisv32_iopin crisv32_led_net1_red;
 
 static inline void crisv32_io_set(struct crisv32_iopin *iopin, int val)
 {
-	long flags;
+	unsigned long flags;
 	spin_lock_irqsave(&iopin->port->lock, flags);
 
 	if (val)
@@ -57,7 +57,7 @@ static inline void crisv32_io_set(struct crisv32_iopin *iopin, int val)
 static inline void crisv32_io_set_dir(struct crisv32_iopin* iopin,
 			       enum crisv32_io_dir dir)
 {
-	long flags;
+	unsigned long flags;
 	spin_lock_irqsave(&iopin->port->lock, flags);
 
 	if (dir == crisv32_io_dir_in)