diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 17:08:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 17:08:56 -0700 |
| commit | 5f8fe4270e53d38421ba34c428c3b58933b48e50 (patch) | |
| tree | 2148a3ba1ec842d0d0ad8f3e3eb209eb6eba673d /arch/cris/arch-v32/kernel/time.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/kernel/time.c')
| -rw-r--r-- | arch/cris/arch-v32/kernel/time.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/kernel/time.c b/arch/cris/arch-v32/kernel/time.c index 65633d0dab8..b1920d8de40 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] = extern void update_xtime_from_cmos(void); extern int set_rtc_mmss(unsigned long nowtime); -extern int setup_irq(int, struct irqaction *); extern int have_rtc; #ifdef CONFIG_CPU_FREQ |