diff options
| author | Andy Whitcroft <apw@shadowen.org> | 2005-06-20 17:29:25 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-07-01 16:35:52 -0400 |
| commit | 43a6b76050aa137c51d00eec91d67ac43ac3846e (patch) | |
| tree | f29f94e98a45c5102f1516afa45ac2ec46f2dd57 /drivers/pci/Makefile | |
| parent | 5848f23d811acc1cb6c19a12e1341e0640a85d0e (diff) | |
[PATCH] gregkh-pci-pci-assign-unassigned-resources fix
It seems that X86 architectures in general need the setup-bus.o
not just those with HOTPLUG. This avoids the following error on
X86_NUMAQ and x86_64:
arch/i386/pci/built-in.o(.init.text+0x15a6): In function `pcibios_init':
: undefined reference to `pci_assign_unassigned_resources'
Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci/Makefile')
| -rw-r--r-- | drivers/pci/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index 7dea494c0d7b..3657f6199c48 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile | |||
| @@ -19,6 +19,7 @@ obj-$(CONFIG_HOTPLUG_PCI) += hotplug/ | |||
| 19 | # | 19 | # |
| 20 | # Some architectures use the generic PCI setup functions | 20 | # Some architectures use the generic PCI setup functions |
| 21 | # | 21 | # |
| 22 | obj-$(CONFIG_X86) += setup-bus.o | ||
| 22 | obj-$(CONFIG_ALPHA) += setup-bus.o setup-irq.o | 23 | obj-$(CONFIG_ALPHA) += setup-bus.o setup-irq.o |
| 23 | obj-$(CONFIG_ARM) += setup-bus.o setup-irq.o | 24 | obj-$(CONFIG_ARM) += setup-bus.o setup-irq.o |
| 24 | obj-$(CONFIG_PARISC) += setup-bus.o | 25 | obj-$(CONFIG_PARISC) += setup-bus.o |