mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 04:01:48 -04:00
Merge branch 'pci/myron-pcibios_setup' into next
* pci/myron-pcibios_setup: xtensa/PCI: factor out pcibios_setup() x86/PCI: adjust section annotations for pcibios_setup() unicore32/PCI: adjust section annotations for pcibios_setup() tile/PCI: factor out pcibios_setup() sparc/PCI: factor out pcibios_setup() sh/PCI: adjust section annotations for pcibios_setup() sh/PCI: factor out pcibios_setup() powerpc/PCI: factor out pcibios_setup() parisc/PCI: factor out pcibios_setup() MIPS/PCI: adjust section annotations for pcibios_setup() MIPS/PCI: factor out pcibios_setup() microblaze/PCI: factor out pcibios_setup() ia64/PCI: factor out pcibios_setup() cris/PCI: factor out pcibios_setup() alpha/PCI: factor out pcibios_setup() PCI: pull pcibios_setup() up into core
This commit is contained in:
commit
85a00dd391
20 changed files with 21 additions and 96 deletions
|
|
@ -2792,6 +2792,18 @@ static void __pci_set_master(struct pci_dev *dev, bool enable)
|
|||
dev->is_busmaster = enable;
|
||||
}
|
||||
|
||||
/**
|
||||
* pcibios_setup - process "pci=" kernel boot arguments
|
||||
* @str: string used to pass in "pci=" kernel boot arguments
|
||||
*
|
||||
* Process kernel boot arguments. This is the default implementation.
|
||||
* Architecture specific implementations can override this as necessary.
|
||||
*/
|
||||
char * __weak __init pcibios_setup(char *str)
|
||||
{
|
||||
return str;
|
||||
}
|
||||
|
||||
/**
|
||||
* pcibios_set_master - enable PCI bus-mastering for device dev
|
||||
* @dev: the PCI device to enable
|
||||
|
|
|
|||
Loading…
Reference in a new issue