Commit 7a1415ee authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents 68d76d4e cf18ecd3

arch/m68k/kernel/pcibios.c

+0 −6
Original line number Diff line number Diff line
@@ -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;

}

arch/m68k/coldfire/dma_timer.c

+1 −1

File changed.

Contains only whitespace changes.