diff options
| author | Jesper Nilsson <jesper.nilsson@axis.com> | 2008-10-29 12:28:40 -0400 |
|---|---|---|
| committer | Jesper Nilsson <jesper.nilsson@axis.com> | 2008-10-29 12:28:40 -0400 |
| commit | 242bfafc8e42da4697c1e2dea108049d14dbac4b (patch) | |
| tree | e81d8bdb3e3490904b5995f6eb78f75ac3cb1c59 /include/asm-cris/arch-v32 | |
| parent | 1d63e726408dfdb3e10ed8f00c383b30ebb333d3 (diff) | |
| parent | a54373eee6e9f5e986a251e852ee1bb83e03671b (diff) | |
Merge branch 'for-next' of git://www.jni.nu/cris into cris_merge
Diffstat (limited to 'include/asm-cris/arch-v32')
| -rw-r--r-- | include/asm-cris/arch-v32/io.h | 4 |
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; | |||
| 43 | 43 | ||
| 44 | static inline void crisv32_io_set(struct crisv32_iopin *iopin, int val) | 44 | static inline void crisv32_io_set(struct crisv32_iopin *iopin, int val) |
| 45 | { | 45 | { |
| 46 | long flags; | 46 | unsigned long flags; |
| 47 | spin_lock_irqsave(&iopin->port->lock, flags); | 47 | spin_lock_irqsave(&iopin->port->lock, flags); |
| 48 | 48 | ||
| 49 | if (val) | 49 | if (val) |
| @@ -57,7 +57,7 @@ static inline void crisv32_io_set(struct crisv32_iopin *iopin, int val) | |||
| 57 | static inline void crisv32_io_set_dir(struct crisv32_iopin* iopin, | 57 | static inline void crisv32_io_set_dir(struct crisv32_iopin* iopin, |
| 58 | enum crisv32_io_dir dir) | 58 | enum crisv32_io_dir dir) |
| 59 | { | 59 | { |
| 60 | long flags; | 60 | unsigned long flags; |
| 61 | spin_lock_irqsave(&iopin->port->lock, flags); | 61 | spin_lock_irqsave(&iopin->port->lock, flags); |
| 62 | 62 | ||
| 63 | if (dir == crisv32_io_dir_in) | 63 | if (dir == crisv32_io_dir_in) |