diff options
| author | iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk> | 2004-08-20 15:19:42 +0000 |
|---|---|---|
| committer | iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk> | 2004-08-20 15:19:42 +0000 |
| commit | e928b392507e49eb27bfae7394ad782aa1796dc2 (patch) | |
| tree | 0a4926bff33178c3af73c479f56758d0bb4b1f34 | |
| parent | 2a7eb6c380b8cc2c0e973d8a2c92b9d47e249dbf (diff) | |
| parent | 9a20894392084046e9f503ec1881eab2362fcfe1 (diff) | |
| download | xen-e928b392507e49eb27bfae7394ad782aa1796dc2.tar.gz xen-e928b392507e49eb27bfae7394ad782aa1796dc2.tar.bz2 xen-e928b392507e49eb27bfae7394ad782aa1796dc2.zip | |
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
| -rw-r--r-- | .rootkeys | 1 | ||||
| -rw-r--r-- | linux-2.6.7-xen-sparse/arch/xen/Makefile | 2 | ||||
| -rw-r--r-- | linux-2.6.7-xen-sparse/drivers/Makefile | 54 |
3 files changed, 55 insertions, 2 deletions
@@ -172,6 +172,7 @@ 40f56239sFcjHiIRmnObRIDF-zaeKQ linux-2.6.7-xen-sparse/arch/xen/kernel/process.c 40f562392LBhwmOxVPsYdkYXMxI_ZQ linux-2.6.7-xen-sparse/arch/xen/kernel/reboot.c 3f68905c5eiA-lBMQSvXLMWS1ikDEA linux-2.6.7-xen-sparse/arch/xen/kernel/xen_proc.c +41261688yS8eAyy-7kzG4KBs0xbYCA linux-2.6.7-xen-sparse/drivers/Makefile 4108f5c1WfTIrs0HZFeV39sttekCTw linux-2.6.7-xen-sparse/drivers/char/mem.c 4111308bZAIzwf_Kzu6x1TZYZ3E0_Q linux-2.6.7-xen-sparse/drivers/char/tty_io.c 40f56239Dp_vMTgz8TEbvo1hjHGc3w linux-2.6.7-xen-sparse/drivers/xen/Makefile diff --git a/linux-2.6.7-xen-sparse/arch/xen/Makefile b/linux-2.6.7-xen-sparse/arch/xen/Makefile index 227bea1244..e3772803d3 100644 --- a/linux-2.6.7-xen-sparse/arch/xen/Makefile +++ b/linux-2.6.7-xen-sparse/arch/xen/Makefile @@ -24,8 +24,6 @@ UTS_MACHINE := $(XENARCH) core-y += arch/xen/kernel/ -drivers-y += drivers/xen/ - include/.asm-ignore: @rm -f include/.asm-ignore @mv include/asm include/.asm-ignore diff --git a/linux-2.6.7-xen-sparse/drivers/Makefile b/linux-2.6.7-xen-sparse/drivers/Makefile new file mode 100644 index 0000000000..1e2b996294 --- /dev/null +++ b/linux-2.6.7-xen-sparse/drivers/Makefile @@ -0,0 +1,54 @@ +# +# Makefile for the Linux kernel device drivers. +# +# 15 Sep 2000, Christoph Hellwig <hch@infradead.org> +# Rewritten to use lists instead of if-statements. +# + +obj-$(CONFIG_PCI) += pci/ +obj-$(CONFIG_PARISC) += parisc/ +obj-$(CONFIG_ACPI_BOOT) += acpi/ +# PnP must come after ACPI since it will eventually need to check if acpi +# was used and do nothing if so +obj-$(CONFIG_PNP) += pnp/ + +# char/ comes before serial/ etc so that the VT console is the boot-time +# default. + +obj-y += char/ +obj-y += serial/ +obj-$(CONFIG_PARPORT) += parport/ +obj-y += base/ block/ misc/ net/ media/ +obj-$(CONFIG_NUBUS) += nubus/ +obj-$(CONFIG_ATM) += atm/ +obj-$(CONFIG_PPC_PMAC) += macintosh/ +obj-$(CONFIG_ARCH_XEN) += xen/ +obj-$(CONFIG_IDE) += ide/ +obj-$(CONFIG_FC4) += fc4/ +obj-$(CONFIG_SCSI) += scsi/ +obj-$(CONFIG_FUSION) += message/ +obj-$(CONFIG_IEEE1394) += ieee1394/ +obj-y += cdrom/ video/ +obj-$(CONFIG_MTD) += mtd/ +obj-$(CONFIG_PCMCIA) += pcmcia/ +obj-$(CONFIG_DIO) += dio/ +obj-$(CONFIG_SBUS) += sbus/ +obj-$(CONFIG_ZORRO) += zorro/ +obj-$(CONFIG_MAC) += macintosh/ +obj-$(CONFIG_PARIDE) += block/paride/ +obj-$(CONFIG_TC) += tc/ +obj-$(CONFIG_USB) += usb/ +obj-$(CONFIG_USB_GADGET) += usb/gadget/ +obj-$(CONFIG_INPUT) += input/ +obj-$(CONFIG_GAMEPORT) += input/gameport/ +obj-$(CONFIG_SERIO) += input/serio/ +obj-$(CONFIG_I2O) += message/ +obj-$(CONFIG_I2C) += i2c/ +obj-$(CONFIG_PHONE) += telephony/ +obj-$(CONFIG_MD) += md/ +obj-$(CONFIG_BT) += bluetooth/ +obj-$(CONFIG_ISDN) += isdn/ +obj-$(CONFIG_MCA) += mca/ +obj-$(CONFIG_EISA) += eisa/ +obj-$(CONFIG_CPU_FREQ) += cpufreq/ +obj-y += firmware/ |