Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6-omap-h63xx.git] / arch / sparc64 / kernel / pci_sun4v.h

diff --git a/arch/sparc64/kernel/pci_sun4v.h b/arch/sparc64/kernel/pci_sun4v.h
index 00322ed0cf8a095cbc0fe0b392a948fdfe226be8..884d25f6158dad36a58c6c4c30365c910530d7a1 100644 (file)
--- a/arch/sparc64/kernel/pci_sun4v.h
+++ b/arch/sparc64/kernel/pci_sun4v.h
@@ -6,13 +6,11 @@
 #ifndef _PCI_SUN4V_H
 #define _PCI_SUN4V_H
 
-extern unsigned long pci_sun4v_devino_to_sysino(unsigned long devhandle,
-                                               unsigned long deino);
-extern unsigned long pci_sun4v_iommu_map(unsigned long devhandle,
-                                        unsigned long tsbid,
-                                        unsigned long num_ttes,
-                                        unsigned long io_attributes,
-                                        unsigned long io_page_list_pa);
+extern long pci_sun4v_iommu_map(unsigned long devhandle,
+                               unsigned long tsbid,
+                               unsigned long num_ttes,
+                               unsigned long io_attributes,
+                               unsigned long io_page_list_pa);
 extern unsigned long pci_sun4v_iommu_demap(unsigned long devhandle,
                                           unsigned long tsbid,
                                           unsigned long num_ttes);