diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 20:08:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 20:08:56 -0400 |
| commit | 5f8fe4270e53d38421ba34c428c3b58933b48e50 (patch) | |
| tree | 2148a3ba1ec842d0d0ad8f3e3eb209eb6eba673d /arch/cris/arch-v32/mach-a3/io.c | |
| parent | d9fbd9a2cd5ac1b286a7d7cdb1a180ce1edaee2f (diff) | |
| parent | 24924ece4482d5466ffcd0affedce63816c88e53 (diff) | |
Merge branch 'for-linus' of git://repo.or.cz/cris-mirror
* 'for-linus' of git://repo.or.cz/cris-mirror:
CRIS: Cleanup linker script using new linker script macros.
ARRAY_SIZE changes
CRIS: convert to asm-generic/hardirq.h
CRISv10: Don't autonegotiate if autonegotiation is off
CRIS: fix defconfig build failure
CRIS: add pgprot_noncached
Diffstat (limited to 'arch/cris/arch-v32/mach-a3/io.c')
| -rw-r--r-- | arch/cris/arch-v32/mach-a3/io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/mach-a3/io.c b/arch/cris/arch-v32/mach-a3/io.c index c22f67ecd9f3..090ceb99ef0b 100644 --- a/arch/cris/arch-v32/mach-a3/io.c +++ b/arch/cris/arch-v32/mach-a3/io.c | |||
| @@ -36,7 +36,7 @@ struct crisv32_ioport crisv32_ioports[] = { | |||
| 36 | }, | 36 | }, |
| 37 | }; | 37 | }; |
| 38 | 38 | ||
| 39 | #define NBR_OF_PORTS sizeof(crisv32_ioports)/sizeof(struct crisv32_ioport) | 39 | #define NBR_OF_PORTS ARRAY_SIZE(crisv32_ioports) |
| 40 | 40 | ||
| 41 | struct crisv32_iopin crisv32_led_net0_green; | 41 | struct crisv32_iopin crisv32_led_net0_green; |
| 42 | struct crisv32_iopin crisv32_led_net0_red; | 42 | struct crisv32_iopin crisv32_led_net0_red; |