diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-18 01:37:44 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-18 01:37:49 -0400 |
| commit | dc3f81b129b5439ba7bac265bbc6a51a39275dae (patch) | |
| tree | 216030731d911249496d2e97206cd61431e31c89 /arch/powerpc/include/asm/iseries/iommu.h | |
| parent | d2517a49d55536b38c7a87e5289550cfedaa4dcc (diff) | |
| parent | 1406de8e11eb043681297adf86d6892ff8efc27a (diff) | |
Merge commit 'v2.6.30-rc6' into perfcounters/core
Merge reason: this branch was on an -rc4 base, merge it up to -rc6
to get the latest upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/powerpc/include/asm/iseries/iommu.h')
| -rw-r--r-- | arch/powerpc/include/asm/iseries/iommu.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/include/asm/iseries/iommu.h b/arch/powerpc/include/asm/iseries/iommu.h index c59ee7e4bed1..1b9692c60899 100644 --- a/arch/powerpc/include/asm/iseries/iommu.h +++ b/arch/powerpc/include/asm/iseries/iommu.h | |||
| @@ -26,10 +26,6 @@ struct vio_dev; | |||
| 26 | struct device_node; | 26 | struct device_node; |
| 27 | struct iommu_table; | 27 | struct iommu_table; |
| 28 | 28 | ||
| 29 | /* Creates table for an individual device node */ | ||
| 30 | extern void iommu_devnode_init_iSeries(struct pci_dev *pdev, | ||
| 31 | struct device_node *dn); | ||
| 32 | |||
| 33 | /* Get table parameters from HV */ | 29 | /* Get table parameters from HV */ |
| 34 | extern void iommu_table_getparms_iSeries(unsigned long busno, | 30 | extern void iommu_table_getparms_iSeries(unsigned long busno, |
| 35 | unsigned char slotno, unsigned char virtbus, | 31 | unsigned char slotno, unsigned char virtbus, |