diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 15:01:22 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 15:01:22 -0400 |
commit | 0a4908e19fd016d60403fc76cf38b2d08d21e2d2 (patch) | |
tree | f8f33a474bfb9835625677c76735fb27fe0a2b75 /arch/mips/tx4938 | |
parent | 2843483d2eb02ad104edbe8b2429fb6a39d25063 (diff) | |
parent | 6f75aaa72af19d3e4d144e13d59e71f51686b77f (diff) |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Delete totally outdated Documentation/mips/time.README
[MIPS] Kill duplicated setup_irq() for cp0 timer
[MIPS] Sibyte: Finish conversion to modern time APIs.
[MIPS] time: Helpers to compute clocksource/event shift and mult values.
[MIPS] SMTC: Build fix.
[MIPS] time: Delete dead code.
[MIPS] MIPSsim: Strip defconfig file to the bones.
Diffstat (limited to 'arch/mips/tx4938')
-rw-r--r-- | arch/mips/tx4938/common/setup.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/mips/tx4938/common/setup.c b/arch/mips/tx4938/common/setup.c index 04f009ccb0eb..3ba4101d141e 100644 --- a/arch/mips/tx4938/common/setup.c +++ b/arch/mips/tx4938/common/setup.c | |||
@@ -43,8 +43,3 @@ plat_mem_setup(void) | |||
43 | { | 43 | { |
44 | toshiba_rbtx4938_setup(); | 44 | toshiba_rbtx4938_setup(); |
45 | } | 45 | } |
46 | |||
47 | void __init plat_timer_setup(struct irqaction *irq) | ||
48 | { | ||
49 | setup_irq(TX4938_IRQ_CPU_TIMER, irq); | ||
50 | } | ||