diff options
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/kernel/csrc-r4k.c | 6 | ||||
| -rw-r--r-- | arch/mips/pci/pci-bcm1480.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/arch/mips/kernel/csrc-r4k.c b/arch/mips/kernel/csrc-r4k.c index 74c5c62365a8..0e2b5cd81f67 100644 --- a/arch/mips/kernel/csrc-r4k.c +++ b/arch/mips/kernel/csrc-r4k.c @@ -5,6 +5,10 @@ * * Copyright (C) 2007 by Ralf Baechle */ +#include <linux/clocksource.h> +#include <linux/init.h> + +#include <asm/time.h> static cycle_t c0_hpt_read(void) { @@ -18,7 +22,7 @@ static struct clocksource clocksource_mips = { .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; -static void __init init_mips_clocksource(void) +void __init init_mips_clocksource(void) { /* Calclate a somewhat reasonable rating value */ clocksource_mips.rating = 200 + mips_hpt_frequency / 10000000; diff --git a/arch/mips/pci/pci-bcm1480.c b/arch/mips/pci/pci-bcm1480.c index 5443ea3596f8..bc647cb77298 100644 --- a/arch/mips/pci/pci-bcm1480.c +++ b/arch/mips/pci/pci-bcm1480.c @@ -76,8 +76,7 @@ static inline void WRITECFG32(u32 addr, u32 data) int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { - This is b0rked. - return dev->irq; + return K_BCM1480_INT_PCI_INTA + pin; } /* Do platform specific device initialization at pci_enable_device() time */ |