Skip to content

L
linux-davinci
Commit 242bfafc authored by Jesper Nilsson's avatar Jesper Nilsson
Browse files
Options

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

parents 1d63e726 a54373ee
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
include/asm-cris/arch-v32/io.h
View file @ 242bfafc
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment