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.

diff --combined arch/mips/tx4938/common/setup.c
index 04f009ccb0eb351ed0846400a012e9090eed3f73,be3b88dd4c1fbee4a23fcd0ac7ca3b1fe660a760..3ba4101d141eda4360f6a438cf2fafbcb5572553
--- 1/arch/mips/tx4938/common/setup.c
--- 2/arch/mips/tx4938/common/setup.c
+++ b/arch/mips/tx4938/common/setup.c
@@@ -24,7 -24,7 +24,7 @@@
  #include <linux/slab.h>
  #include <linux/random.h>
  #include <linux/irq.h>
 -#include <asm/bitops.h>
 +#include <linux/bitops.h>
  #include <asm/bootinfo.h>
  #include <asm/io.h>
  #include <asm/irq.h>
@@@ -43,8 -43,3 +43,3 @@@ plat_mem_setup(void
  {
        toshiba_rbtx4938_setup();
  }
- 
- void __init plat_timer_setup(struct irqaction *irq)
- {
-       setup_irq(TX4938_IRQ_CPU_TIMER, irq);
- }