diff options
Diffstat (limited to 'arch/cris/arch-v32')
-rw-r--r-- | arch/cris/arch-v32/kernel/smp.c | 2 | ||||
-rw-r--r-- | arch/cris/arch-v32/kernel/time.c | 1 | ||||
-rw-r--r-- | arch/cris/arch-v32/mach-a3/io.c | 2 | ||||
-rw-r--r-- | arch/cris/arch-v32/mach-fs/io.c | 2 |
4 files changed, 2 insertions, 5 deletions
diff --git a/arch/cris/arch-v32/kernel/smp.c b/arch/cris/arch-v32/kernel/smp.c index d2a3ff8c4d37..058adddf4e4b 100644 --- a/arch/cris/arch-v32/kernel/smp.c +++ b/arch/cris/arch-v32/kernel/smp.c | |||
@@ -52,8 +52,6 @@ static struct mm_struct* flush_mm; | |||
52 | static struct vm_area_struct* flush_vma; | 52 | static struct vm_area_struct* flush_vma; |
53 | static unsigned long flush_addr; | 53 | static unsigned long flush_addr; |
54 | 54 | ||
55 | extern int setup_irq(int, struct irqaction *); | ||
56 | |||
57 | /* Mode registers */ | 55 | /* Mode registers */ |
58 | static unsigned long irq_regs[NR_CPUS] = { | 56 | static unsigned long irq_regs[NR_CPUS] = { |
59 | regi_irq, | 57 | regi_irq, |
diff --git a/arch/cris/arch-v32/kernel/time.c b/arch/cris/arch-v32/kernel/time.c index 65633d0dab86..b1920d8de403 100644 --- a/arch/cris/arch-v32/kernel/time.c +++ b/arch/cris/arch-v32/kernel/time.c | |||
@@ -46,7 +46,6 @@ unsigned long timer_regs[NR_CPUS] = | |||
46 | 46 | ||
47 | extern void update_xtime_from_cmos(void); | 47 | extern void update_xtime_from_cmos(void); |
48 | extern int set_rtc_mmss(unsigned long nowtime); | 48 | extern int set_rtc_mmss(unsigned long nowtime); |
49 | extern int setup_irq(int, struct irqaction *); | ||
50 | extern int have_rtc; | 49 | extern int have_rtc; |
51 | 50 | ||
52 | #ifdef CONFIG_CPU_FREQ | 51 | #ifdef CONFIG_CPU_FREQ |
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; |
diff --git a/arch/cris/arch-v32/mach-fs/io.c b/arch/cris/arch-v32/mach-fs/io.c index cb6327b1f8f8..a6958661fa8e 100644 --- a/arch/cris/arch-v32/mach-fs/io.c +++ b/arch/cris/arch-v32/mach-fs/io.c | |||
@@ -52,7 +52,7 @@ struct crisv32_ioport crisv32_ioports[] = { | |||
52 | } | 52 | } |
53 | }; | 53 | }; |
54 | 54 | ||
55 | #define NBR_OF_PORTS sizeof(crisv32_ioports)/sizeof(struct crisv32_ioport) | 55 | #define NBR_OF_PORTS ARRAY_SIZE(crisv32_ioports) |
56 | 56 | ||
57 | struct crisv32_iopin crisv32_led_net0_green; | 57 | struct crisv32_iopin crisv32_led_net0_green; |
58 | struct crisv32_iopin crisv32_led_net0_red; | 58 | struct crisv32_iopin crisv32_led_net0_red; |