]> err.no Git - linux-2.6/commit
x86: undo visws/numaq build changes
authorThomas Gleixner <tglx@linutronix.de>
Fri, 2 May 2008 19:24:30 +0000 (21:24 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 4 May 2008 18:04:45 +0000 (20:04 +0200)
commit48b83d2425d7781bb625b1c37b5f2a8963b6e23b
tree06ce6081c5ad7cde2790beaf14410bd09616c3dd
parentafa26be86b65a7183ceac29bdf1f51d6fc6932f0
x86: undo visws/numaq build changes

arch/x86/pci/Makefile_32 has a nasty detail. VISWS and NUMAQ build
override the generic pci-y rules. This needs a proper cleanup, but
that needs more thoughts. Undo

commit 895d30935ebe05f192e844792668bf8d19deaae7
    x86: numaq fix
    do not override the existing pci-y rule when adding visws or
    numaq rules.

There is also a stupid init function ordering problem vs. acpi.o

Add comments to the Makefile to avoid tripping over this again.

Remove the srat stub code in discontig_32.c to allow a proper NUMAQ
build.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/mm/discontig_32.c
arch/x86/pci/Makefile_32