ia64/xen-unstable

changeset 6671:7a36f58f64ee

merge?
author kaf24@firebug.cl.cam.ac.uk
date Wed Sep 07 09:50:57 2005 +0000 (2005-09-07)
parents 77d8b5e40da7 99f12399b25a
children c9fd91d7540d
files linux-2.6-xen-sparse/arch/xen/i386/kernel/setup.c linux-2.6-xen-sparse/arch/xen/kernel/reboot.c linux-2.6-xen-sparse/arch/xen/x86_64/kernel/setup.c tools/libxc/Makefile tools/libxc/xc_linux_save.c tools/libxc/xc_load_aout9.c xen/include/public/arch-x86_32.h xen/include/public/arch-x86_64.h
line diff
     4.1 --- a/tools/libxc/Makefile	Wed Sep 07 09:42:47 2005 +0000
     4.2 +++ b/tools/libxc/Makefile	Wed Sep 07 09:50:57 2005 +0000
     4.3 @@ -139,7 +139,7 @@ libxenguest.so: libxenguest.so.$(MAJOR)
     4.4  libxenguest.so.$(MAJOR): libxenguest.so.$(MAJOR).$(MINOR)
     4.5  	ln -sf $< $@
     4.6  
     4.7 -libxenguest.so.$(MAJOR).$(MINOR): $(PIC_BUILD_OBJS)
     4.8 +libxenguest.so.$(MAJOR).$(MINOR): $(PIC_BUILD_OBJS) libxenctrl.so
     4.9  	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxenguest.so.$(MAJOR) -shared -o $@ $^ -lz -lxenctrl
    4.10  
    4.11  -include $(DEPS)