diff options
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/coldfire/dma_timer.c | 2 | ||||
| -rw-r--r-- | arch/m68k/kernel/pcibios.c | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/arch/m68k/coldfire/dma_timer.c b/arch/m68k/coldfire/dma_timer.c index cbb289439606..91e6728f51ed 100644 --- a/arch/m68k/coldfire/dma_timer.c +++ b/arch/m68k/coldfire/dma_timer.c @@ -48,7 +48,7 @@ static struct clocksource clocksource_cf_dt = { .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; -static int __init init_cf_dt_clocksource(void) +static int __init init_cf_dt_clocksource(void) { /* * We setup DMA timer 0 in free run mode. This incrementing counter is diff --git a/arch/m68k/kernel/pcibios.c b/arch/m68k/kernel/pcibios.c index b0e110d3d2e6..9504eb19d73a 100644 --- a/arch/m68k/kernel/pcibios.c +++ b/arch/m68k/kernel/pcibios.c @@ -92,9 +92,3 @@ void pcibios_fixup_bus(struct pci_bus *bus) pci_write_config_byte(dev, PCI_LATENCY_TIMER, 32); } } - -char *pcibios_setup(char *str) -{ - return str; -} - |