Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  tc35815: Use irq number for tc35815-mac platform device id
  [MIPS] Malta: Fix reading the PCI clock frequency on big-endian
  [MIPS] SMTC: Fix build error.

2 files changed, 3 insertions, 3 deletions

diff --git a/arch/mips/mips-boards/malta/malta_setup.c b/arch/mips/mips-boards/malta/malta_setup.c
index 9a2636e56243..bc43a5c2224d 100644
--- a/arch/mips/mips-boards/malta/malta_setup.c
+++ b/arch/mips/mips-boards/malta/malta_setup.c
@@ -149,7 +149,7 @@ void __init plat_mem_setup(void)
         /* Check PCI clock */
         {
                 unsigned int __iomem *jmpr_p = (unsigned int *) ioremap(MALTA_JMPRS_REG, sizeof(unsigned int));
-                int jmpr = (readw(jmpr_p) >> 2) & 0x07;
+                int jmpr = (__raw_readl(jmpr_p) >> 2) & 0x07;
                 static const int pciclocks[] __initdata = {
                         33, 20, 25, 30, 12, 16, 37, 10
                 };
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/setup.c b/arch/mips/tx4938/toshiba_rbtx4938/setup.c
index 4a8152375efe..632e5d201353 100644
--- a/arch/mips/tx4938/toshiba_rbtx4938/setup.c
+++ b/arch/mips/tx4938/toshiba_rbtx4938/setup.c
@@ -598,8 +598,8 @@ static int __init rbtx4938_ethaddr_init(void)
                         printk(KERN_WARNING "seeprom: bad checksum.\n");
         }
         for (i = 0; i < 2; i++) {
-                unsigned int slot = TX4938_PCIC_IDSEL_AD_TO_SLOT(31 - i);
-                unsigned int id = (1 << 8) | PCI_DEVFN(slot, 0); /* bus 1 */
+                unsigned int id =
+                        TXX9_IRQ_BASE + (i ? TX4938_IR_ETH1 : TX4938_IR_ETH0);
                 struct platform_device *pdev;
                 if (!(tx4938_ccfgptr->pcfg &
                       (i ? TX4938_PCFG_ETH1_SEL : TX4938_PCFG_ETH0_SEL)))