ia64/xen-unstable

changeset 2320:dfe33644e3f1

bitkeeper revision 1.1159.45.11 (4126168eTuWjNHdW-C1gjvkm8XBaKw)

Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk
author iap10@labyrinth.cl.cam.ac.uk
date Fri Aug 20 15:19:42 2004 +0000 (2004-08-20)
parents 959e38e07474 813ffecef534
children 1a4d0106bc54
files .rootkeys linux-2.6.7-xen-sparse/arch/xen/Makefile linux-2.6.7-xen-sparse/drivers/Makefile
line diff
     1.1 --- a/.rootkeys	Fri Aug 20 14:02:42 2004 +0000
     1.2 +++ b/.rootkeys	Fri Aug 20 15:19:42 2004 +0000
     1.3 @@ -172,6 +172,7 @@ 4110f478aeQWllIN7J4kouAHiAqrPw linux-2.6
     1.4  40f56239sFcjHiIRmnObRIDF-zaeKQ linux-2.6.7-xen-sparse/arch/xen/kernel/process.c
     1.5  40f562392LBhwmOxVPsYdkYXMxI_ZQ linux-2.6.7-xen-sparse/arch/xen/kernel/reboot.c
     1.6  3f68905c5eiA-lBMQSvXLMWS1ikDEA linux-2.6.7-xen-sparse/arch/xen/kernel/xen_proc.c
     1.7 +41261688yS8eAyy-7kzG4KBs0xbYCA linux-2.6.7-xen-sparse/drivers/Makefile
     1.8  4108f5c1WfTIrs0HZFeV39sttekCTw linux-2.6.7-xen-sparse/drivers/char/mem.c
     1.9  4111308bZAIzwf_Kzu6x1TZYZ3E0_Q linux-2.6.7-xen-sparse/drivers/char/tty_io.c
    1.10  40f56239Dp_vMTgz8TEbvo1hjHGc3w linux-2.6.7-xen-sparse/drivers/xen/Makefile
     2.1 --- a/linux-2.6.7-xen-sparse/arch/xen/Makefile	Fri Aug 20 14:02:42 2004 +0000
     2.2 +++ b/linux-2.6.7-xen-sparse/arch/xen/Makefile	Fri Aug 20 15:19:42 2004 +0000
     2.3 @@ -24,8 +24,6 @@ UTS_MACHINE := $(XENARCH)
     2.4  
     2.5  core-y	+= arch/xen/kernel/
     2.6  
     2.7 -drivers-y	+= drivers/xen/
     2.8 -
     2.9  include/.asm-ignore:
    2.10  	@rm -f include/.asm-ignore
    2.11  	@mv include/asm include/.asm-ignore
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/linux-2.6.7-xen-sparse/drivers/Makefile	Fri Aug 20 15:19:42 2004 +0000
     3.3 @@ -0,0 +1,54 @@
     3.4 +#
     3.5 +# Makefile for the Linux kernel device drivers.
     3.6 +#
     3.7 +# 15 Sep 2000, Christoph Hellwig <hch@infradead.org>
     3.8 +# Rewritten to use lists instead of if-statements.
     3.9 +#
    3.10 +
    3.11 +obj-$(CONFIG_PCI)		+= pci/
    3.12 +obj-$(CONFIG_PARISC)		+= parisc/
    3.13 +obj-$(CONFIG_ACPI_BOOT)		+= acpi/
    3.14 +# PnP must come after ACPI since it will eventually need to check if acpi
    3.15 +# was used and do nothing if so
    3.16 +obj-$(CONFIG_PNP)		+= pnp/
    3.17 +
    3.18 +# char/ comes before serial/ etc so that the VT console is the boot-time
    3.19 +# default.
    3.20 +
    3.21 +obj-y				+= char/
    3.22 +obj-y				+= serial/
    3.23 +obj-$(CONFIG_PARPORT)		+= parport/
    3.24 +obj-y				+= base/ block/ misc/ net/ media/
    3.25 +obj-$(CONFIG_NUBUS)		+= nubus/
    3.26 +obj-$(CONFIG_ATM)		+= atm/
    3.27 +obj-$(CONFIG_PPC_PMAC)		+= macintosh/
    3.28 +obj-$(CONFIG_ARCH_XEN)		+= xen/
    3.29 +obj-$(CONFIG_IDE)		+= ide/
    3.30 +obj-$(CONFIG_FC4)		+= fc4/
    3.31 +obj-$(CONFIG_SCSI)		+= scsi/
    3.32 +obj-$(CONFIG_FUSION)		+= message/
    3.33 +obj-$(CONFIG_IEEE1394)		+= ieee1394/
    3.34 +obj-y				+= cdrom/ video/
    3.35 +obj-$(CONFIG_MTD)		+= mtd/
    3.36 +obj-$(CONFIG_PCMCIA)		+= pcmcia/
    3.37 +obj-$(CONFIG_DIO)		+= dio/
    3.38 +obj-$(CONFIG_SBUS)		+= sbus/
    3.39 +obj-$(CONFIG_ZORRO)		+= zorro/
    3.40 +obj-$(CONFIG_MAC)		+= macintosh/
    3.41 +obj-$(CONFIG_PARIDE) 		+= block/paride/
    3.42 +obj-$(CONFIG_TC)		+= tc/
    3.43 +obj-$(CONFIG_USB)		+= usb/
    3.44 +obj-$(CONFIG_USB_GADGET)	+= usb/gadget/
    3.45 +obj-$(CONFIG_INPUT)		+= input/
    3.46 +obj-$(CONFIG_GAMEPORT)		+= input/gameport/
    3.47 +obj-$(CONFIG_SERIO)		+= input/serio/
    3.48 +obj-$(CONFIG_I2O)		+= message/
    3.49 +obj-$(CONFIG_I2C)		+= i2c/
    3.50 +obj-$(CONFIG_PHONE)		+= telephony/
    3.51 +obj-$(CONFIG_MD)		+= md/
    3.52 +obj-$(CONFIG_BT)		+= bluetooth/
    3.53 +obj-$(CONFIG_ISDN)		+= isdn/
    3.54 +obj-$(CONFIG_MCA)		+= mca/
    3.55 +obj-$(CONFIG_EISA)		+= eisa/
    3.56 +obj-$(CONFIG_CPU_FREQ)		+= cpufreq/
    3.57 +obj-y				+= firmware/