[Xen-changelog] Merged.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User emellor@xxxxxxxxxxxxxxxxxxxxxx
# Node ID a659a3f200669ec3a4b7e9bec29cd9e0c3749d18
# Parent  92b5fa5e83974f5945ae28a9228ecd3bad297bfa
# Parent  47a55b3b7b391c0b920939ab475ef137758e4a90
Merged.

diff -r 92b5fa5e8397 -r a659a3f20066 xen/Makefile
--- a/xen/Makefile      Tue Mar 21 10:44:18 2006
+++ b/xen/Makefile      Tue Mar 21 10:44:56 2006
@@ -55,14 +55,6 @@
        [ -e include/asm ] || ln -sf asm-$(TARGET_ARCH) include/asm
        $(MAKE) -C arch/$(TARGET_ARCH) asm-offsets.s
        $(MAKE) include/asm-$(TARGET_ARCH)/asm-offsets.h
-ifneq ($(TARGET_ARCH),x86)
-       $(MAKE) -C common
-       $(MAKE) -C drivers
-ifeq ($(ACM_SECURITY),y)
-       $(MAKE) -C acm
-endif
-       $(MAKE) -C arch/$(TARGET_ARCH)
-endif
        $(MAKE) -C arch/$(TARGET_ARCH) $(TARGET)
 
 # drivers/char/console.o contains static banner/compile info. Blow it away.

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog