ia64/xen-unstable

changeset 6324:5e71bcc3b51a

Ordering was broken in the course of separating XEN-overridden
sources from those getting used through symlink creation.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
author kaf24@firebug.cl.cam.ac.uk
date Mon Aug 22 08:51:04 2005 +0000 (2005-08-22)
parents de5d85a66751
children 8cc3e7262a23
files linux-2.6-xen-sparse/arch/xen/i386/pci/Makefile linux-2.6-xen-sparse/arch/xen/x86_64/pci/Makefile
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/xen/i386/pci/Makefile	Mon Aug 22 08:36:21 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/xen/i386/pci/Makefile	Mon Aug 22 08:51:04 2005 +0000
     1.3 @@ -17,7 +17,7 @@ l-pci-y				+= irq.o
     1.4  c-pci-$(CONFIG_X86_VISWS)	:= visws.o fixup.o
     1.5  pci-$(CONFIG_X86_VISWS)		:=
     1.6  c-pci-$(CONFIG_X86_NUMAQ)	:= numa.o
     1.7 -pci-$(CONFIG_X86_NUMAQ)		:= irq.o
     1.8 +l-pci-$(CONFIG_X86_NUMAQ)	:= irq.o
     1.9  
    1.10  obj-y				+= $(pci-y)
    1.11  c-obj-y				+= $(c-pci-y) common.o
    1.12 @@ -27,6 +27,7 @@ c-link	:=
    1.13  $(patsubst %.o,$(obj)/%.c,$(c-obj-y) $(c-link)):
    1.14  	@ln -fsn $(srctree)/arch/i386/pci/$(notdir $@) $@
    1.15  
    1.16 -obj-y	+= $(c-obj-y) $(l-pci-y)
    1.17 +# Make sure irq.o gets linked in before common.o
    1.18 +obj-y	+= $(patsubst common.o,$(l-pci-y) common.o,$(c-obj-y))
    1.19  
    1.20  clean-files += $(patsubst %.o,%.c,$(c-obj-y) $(c-obj-) $(c-link))
     2.1 --- a/linux-2.6-xen-sparse/arch/xen/x86_64/pci/Makefile	Mon Aug 22 08:36:21 2005 +0000
     2.2 +++ b/linux-2.6-xen-sparse/arch/xen/x86_64/pci/Makefile	Mon Aug 22 08:51:04 2005 +0000
     2.3 @@ -30,8 +30,9 @@ c-link	:=
     2.4  $(patsubst %.o,$(obj)/%.c,$(c-i386-obj-y)):
     2.5  	@ln -fsn $(srctree)/arch/i386/pci/$(notdir $@) $@
     2.6  
     2.7 -obj-y	+= $(c-i386-obj-y) $(c-obj-y)
     2.8 -obj-y	+= $(c-xen-obj-y)
     2.9 +# Make sure irq.o gets linked in before common.o
    2.10 +obj-y	+= $(patsubst common.o,$(c-xen-obj-y) common.o,$(c-i386-obj-y))
    2.11 +obj-y	+= $(c-obj-y)
    2.12  
    2.13  clean-files += $(patsubst %.o,%.c,$(c-obj-y) $(c-obj-) $(c-link))
    2.14  clean-files += $(patsubst %.o,%.c,$(c-i386-obj-y) $(c-i386-obj-))