ia64/xen-unstable

changeset 2138:4de1d47d699c

bitkeeper revision 1.1159.1.20 (41178e88A1S5EfFziBPZym2EyUQXSw)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xeno.bk-26dom0
author cl349@freefall.cl.cam.ac.uk
date Mon Aug 09 14:47:36 2004 +0000 (2004-08-09)
parents bf915c915598 629e24e00cff
children 58fd83050a1f ba0b77068ab6
files linux-2.6.7-xen-sparse/arch/xen/i386/kernel/Makefile
line diff
     1.1 --- a/linux-2.6.7-xen-sparse/arch/xen/i386/kernel/Makefile	Mon Aug 09 12:32:03 2004 +0000
     1.2 +++ b/linux-2.6.7-xen-sparse/arch/xen/i386/kernel/Makefile	Mon Aug 09 14:47:36 2004 +0000
     1.3 @@ -9,10 +9,10 @@ CFLAGS	+= -Iarch/$(XENARCH)/kernel
     1.4  extra-y := head.o init_task.o vmlinux.lds.s
     1.5  
     1.6  obj-y	:= traps.o irq.o ldt.o setup.o entry.o time.o pci-dma.o process.o \
     1.7 -		signal.o i386_ksyms.o
     1.8 +		ioport.o signal.o i386_ksyms.o
     1.9  
    1.10  c-obj-y	:= semaphore.o vm86.o \
    1.11 -		ptrace.o ioport.o sys_i386.o \
    1.12 +		ptrace.o sys_i386.o \
    1.13  		i387.o dmi_scan.o bootflag.o \
    1.14  		doublefault.o
    1.15  s-obj-y	:=