[oops, forgot to change the Subject: for the first two patches, sorry]
ChangeSet 1.875.1.3, 2002/11/02 22:57:45-08:00, greg@kroah.com
PCI: move EXPORT_SYMBOL for the pbus functions to the setup-bus.c file.
This fixes a linking error if setup-bus.c isn't compiled into the kernel.
diff -Nru a/drivers/pci/Makefile b/drivers/pci/Makefile
--- a/drivers/pci/Makefile Tue Nov 5 17:26:20 2002
+++ b/drivers/pci/Makefile Tue Nov 5 17:26:20 2002
@@ -3,7 +3,7 @@
#
export-objs := access.o hotplug.o pci-driver.o pci.o pool.o \
- probe.o proc.o search.o compat.o
+ probe.o proc.o search.o compat.o setup-bus.o
obj-y += access.o probe.o pci.o pool.o quirks.o \
compat.o names.o pci-driver.o search.o hotplug.o
diff -Nru a/drivers/pci/pci.c b/drivers/pci/pci.c
--- a/drivers/pci/pci.c Tue Nov 5 17:26:20 2002
+++ b/drivers/pci/pci.c Tue Nov 5 17:26:20 2002
@@ -745,8 +745,6 @@
EXPORT_SYMBOL(pci_dac_set_dma_mask);
EXPORT_SYMBOL(pci_assign_resource);
EXPORT_SYMBOL(pci_find_parent_resource);
-EXPORT_SYMBOL(pbus_size_bridges);
-EXPORT_SYMBOL(pbus_assign_resources);
EXPORT_SYMBOL(pci_set_power_state);
EXPORT_SYMBOL(pci_save_state);
diff -Nru a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
--- a/drivers/pci/setup-bus.c Tue Nov 5 17:26:20 2002
+++ b/drivers/pci/setup-bus.c Tue Nov 5 17:26:20 2002
@@ -19,6 +19,7 @@
#include <linux/init.h>
#include <linux/kernel.h>
+#include <linux/module.h>
#include <linux/pci.h>
#include <linux/errno.h>
#include <linux/ioport.h>
@@ -357,6 +358,7 @@
}
pbus_size_mem(bus, mask, type);
}
+EXPORT_SYMBOL(pbus_size_bridges);
void __devinit
pbus_assign_resources(struct pci_bus *bus)
@@ -379,6 +381,7 @@
pci_setup_bridge(b);
}
}
+EXPORT_SYMBOL(pbus_assign_resources);
void __init
pci_assign_unassigned_resources(void)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Thu Nov 07 2002 - 22:00:41 EST