kevin/linux
1
Fork 0
Code

m68knommu: updates and fixes for v6.6

Browse Source 
Fixes include:
 . white space cleanup in dma code
 . removal of unused pcibios_setup() code
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEmsfM6tQwfNjBOxr3TiQVqaG9L4AFAmT1K6cACgkQTiQVqaG9
 L4B3WxAAn96xP54QdAh5HAXoCyFTiZX8cd+Z8mtSzHMVVht+fs93xlJKBWaBbNh0
 NWRLAXpWq8aip10PX4gPx/LQmInlBCr95TvJdiefyAXBQ0vyH4rDIXmJofu3Sf4L
 efe7z7ENGwuqHCS7zckF3OzZ2lt4OcuvjNc6xPnFtKG4aM32OSxlvmuyD0nofwxF
 uHfA/5Zq6n+RdijXu81xwPXUhpQUAd+kH6SRpsxC8+gdGlqI4dDYtVdyBZesHGFY
 dbPGbl+UwnHuVVVgOycJilXGAHZ/U+yqrJasSRPD3IvXrw4a4lWIRnCsnoiatkmp
 K6NGqEFcCHZ8VJT0GMyne4QC8YYKbcMuu7LFkeunPoZ6Viio/W6LrW74KaBV5OjA
 jOWUb+olR2Wd3yzfzakwszn7p15aDO6FoV7AHEWcQ0EeJQ6OQgDHWHfO8H5dHBS0
 ve7Tr8Z3f01ahRZAjAqxvuTdckfP0GZNMIaopWlIpHsVFNQXvuvNyaYU/N+jhKC5
 9hxe7YHoY52yNYZVDC7vk8UR8aRT+E3GmuuRa+X3jCQ7AM19pl5A8jbVZRWloM00
 Qla5fweqDyblvfwkfpjIDOxlDnAOvs/a1ap8KM5BK6dbVHaHbm3wT7QdeiqTeDID
 PBIQbl9nHGNPApsbprWE4t6eW5i0M9GMM/lzWk7cpa2LJnRDkGY=
 =erBK
 -----END PGP SIGNATURE-----

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()
This commit is contained in:
Linus Torvalds 2023-09-04 11:34:33 -07:00
commit 7a1415eebe
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/m68k/coldfire/dma_timer.c
View File

@ -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

6
arch/m68k/kernel/pcibios.c
View File

@ -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;
}