summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJesper Nilsson <jesper.nilsson@axis.com>2008-10-29 17:28:40 +0100
committerJesper Nilsson <jesper.nilsson@axis.com>2008-10-29 17:28:40 +0100
commit242bfafc8e42da4697c1e2dea108049d14dbac4b (patch)
treee81d8bdb3e3490904b5995f6eb78f75ac3cb1c59 /include
parent1d63e726408dfdb3e10ed8f00c383b30ebb333d3 (diff)
parenta54373eee6e9f5e986a251e852ee1bb83e03671b (diff)
Merge branch 'for-next' of git://www.jni.nu/cris into cris_merge
Diffstat (limited to 'include')
-rw-r--r--include/asm-cris/arch-v32/io.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-cris/arch-v32/io.h b/include/asm-cris/arch-v32/io.h
index 6b38912f29ba..72024452cea9 100644
--- 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)