diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-12-07 16:10:22 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-11 13:46:11 +1100 |
| commit | 1dee20262f4b16db73b2f24036bd423e8a7d693d (patch) | |
| tree | 5556bf57ef7d71bf22343c48c3f20715df6cb56d /arch/powerpc/platforms/iseries/pci.h | |
| parent | 1be9ad650986a87c25686abda97bdea330359708 (diff) | |
| download | talos-op-linux-1dee20262f4b16db73b2f24036bd423e8a7d693d.tar.gz talos-op-linux-1dee20262f4b16db73b2f24036bd423e8a7d693d.zip | |
[POWERPC] iSeries: Merge vpdinfo.c into pci.c
There was only one global function in vpdinfo.c and it was only called
from pci.c, so merge them and make the function static.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/iseries/pci.h')
| -rw-r--r-- | arch/powerpc/platforms/iseries/pci.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/iseries/pci.h b/arch/powerpc/platforms/iseries/pci.h index 5f517cf23082..180aa74afb2d 100644 --- a/arch/powerpc/platforms/iseries/pci.h +++ b/arch/powerpc/platforms/iseries/pci.h @@ -30,10 +30,6 @@ * End Change Activity */ -#include <asm/iseries/hv_types.h> - -struct pci_dev; /* For Forward Reference */ - /* * Decodes Linux DevFn to iSeries DevFn, bridge device, or function. * For Linux, see PCI_SLOT and PCI_FUNC in include/linux/pci.h @@ -47,8 +43,6 @@ struct pci_dev; /* For Forward Reference */ #define ISERIES_GET_DEVICE_FROM_SUBBUS(subbus) ((subbus >> 5) & 0x7) #define ISERIES_GET_FUNCTION_FROM_SUBBUS(subbus) ((subbus >> 2) & 0x7) -extern void iseries_device_information(struct pci_dev *pdev, int count, - u16 bus, HvSubBusNumber subbus); #ifdef CONFIG_PCI extern void iSeries_pcibios_init(void); extern void iSeries_pci_final_fixup(void); |
