ppc64: fix non-iSeries build

diff --git a/arch/ppc64/kernel/iSeries_iommu.c b/arch/ppc64/kernel/iSeries_iommu.c
index 6e1329018c1b2868c184e33e8ed65a869c6ffd12..c62f1094f686f8f12cddfee0c9cdf7ef9ade3608 100644 (file)
--- a/arch/ppc64/kernel/iSeries_iommu.c
+++ b/arch/ppc64/kernel/iSeries_iommu.c
@@ -58,8 +58,16 @@ static struct iSeries_Device_Node vio_dev_node  = { .LogicalSlot = 0xFF, .iommu_
 static struct pci_dev _veth_dev = { .sysdata = &veth_dev_node };
 static struct pci_dev _vio_dev  = { .sysdata = &vio_dev_node, .dev.bus = &pci_bus_type  };
 
+/*
+ * I wonder what the deal is with these.  Nobody uses them.  Why do they
+ * exist? Why do we export them to modules? Why is this comment here, and
+ * why didn't I just delete them?
+ */
 struct pci_dev *iSeries_veth_dev = &_veth_dev;
-struct device *iSeries_vio_dev  = &_vio_dev.dev;
+struct device *iSeries_vio_dev = &_vio_dev.dev;
+
+EXPORT_SYMBOL(iSeries_veth_dev);
+EXPORT_SYMBOL(iSeries_vio_dev);
 
 extern struct list_head iSeries_Global_Device_List;
 

diff --git a/arch/ppc64/kernel/ppc_ksyms.c b/arch/ppc64/kernel/ppc_ksyms.c
index 695bcfce421a1fd89ca201b7e180702ce45d4190..bbb97157b8e4a9867a81c2fa33c8c7e5ab7b9b85 100644 (file)
--- a/arch/ppc64/kernel/ppc_ksyms.c
+++ b/arch/ppc64/kernel/ppc_ksyms.c
@@ -53,9 +53,6 @@ extern int do_signal(sigset_t *, struct pt_regs *);
 
 int abs(int);
 
-extern struct pci_dev * iSeries_veth_dev;
-extern struct pci_dev * iSeries_vio_dev;
-
 EXPORT_SYMBOL(do_signal);
 EXPORT_SYMBOL(sys_ioctl);
 
@@ -157,9 +154,6 @@ EXPORT_SYMBOL(eeh_total_mmio_ffs);
 #endif /* CONFIG_PPC_ISERIES */
 #endif /* CONFIG_PCI */
 
-EXPORT_SYMBOL(iSeries_veth_dev);
-EXPORT_SYMBOL(iSeries_vio_dev);
-
 EXPORT_SYMBOL(start_thread);
 EXPORT_SYMBOL(kernel_thread);