diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-04 11:34:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-04 11:34:33 -0700 |
| commit | 7a1415eebeece5a27fb40c0242b171c104ad5727 (patch) | |
| tree | 68f6115e613162fcb7f49cd2025dfa7a0a448d79 | |
| parent | 68d76d4e7e506664ffb7b28805469ed73044368f (diff) | |
| parent | cf18ecd34f71dfd2815046d4c0d7b6439bb0cbde (diff) | |
| download | linux-7a1415eebeece5a27fb40c0242b171c104ad5727.tar.gz | |
Merge tag 'm68knommu-for-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu updates from Greg Ungerer:
"Two changes, one a trivial white space clean up, the other removes the
unnecessary local pcibios_setup() code"
* tag 'm68knommu-for-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k: coldfire: dma_timer: ERROR: "foo __init bar" should be "foo __init bar"
m68k/pci: Drop useless pcibios_setup()
| -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 cbb28943960651..91e6728f51ed65 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 b0e110d3d2e600..9504eb19d73a9c 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; -} - |