diff options
| author |   Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-17 16:07:43 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-17 16:07:43 +1000 |
| commit | eda485f06d17f98bd58559fb5dd331951ffd1608 (patch) | |
| tree | c76f119e68734932c6751cd14fdd420544da92c3 /arch/powerpc/include | |
| parent | powerpc/mm: Match variable types to API (diff) | |
| parent | Merge commit 'v3.6-rc5' into pci/gavin-window-alignment (diff) | |
| download | linux-dev-eda485f06d17f98bd58559fb5dd331951ffd1608.tar.xz linux-dev-eda485f06d17f98bd58559fb5dd331951ffd1608.zip | |
Merge remote-tracking branch 'pci/pci/gavin-window-alignment' into next
Merge Gavin patches from the PCI tree as subsequent powerpc
patches are going to depend on them
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/include')
| -rw-r--r-- | arch/powerpc/include/asm/machdep.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h index 236b4779ec4f..8111e1b78f7f 100644 --- a/arch/powerpc/include/asm/machdep.h +++ b/arch/powerpc/include/asm/machdep.h @@ -215,6 +215,9 @@ struct machdep_calls { /* Called after scan and before resource survey */ void (*pcibios_fixup_phb)(struct pci_controller *hose); + /* Called during PCI resource reassignment */ + resource_size_t (*pcibios_window_alignment)(struct pci_bus *, unsigned long type); + /* Called to shutdown machine specific hardware not already controlled * by other drivers. */ |