diff options
| author | awilliam@xenbuild.aw <awilliam@xenbuild.aw> | 2006-08-02 13:39:47 -0600 |
|---|---|---|
| committer | awilliam@xenbuild.aw <awilliam@xenbuild.aw> | 2006-08-02 13:39:47 -0600 |
| commit | 6140eef9641605d779df256188b02e0929097e64 (patch) | |
| tree | 7a61713030f8ebf0b34c5702a937a03faca37e7d /buildconfigs/linux-defconfig_xen_ia64 | |
| parent | d884052b4bf9e2c090713f7422b330bcbdcf517b (diff) | |
| parent | 028e72eee5034628bbc044e74883f1b3785faf97 (diff) | |
| download | xen-6140eef9641605d779df256188b02e0929097e64.tar.gz xen-6140eef9641605d779df256188b02e0929097e64.tar.bz2 xen-6140eef9641605d779df256188b02e0929097e64.zip | |
merge with xen-unstable.hg
Diffstat (limited to 'buildconfigs/linux-defconfig_xen_ia64')
| -rw-r--r-- | buildconfigs/linux-defconfig_xen_ia64 | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/buildconfigs/linux-defconfig_xen_ia64 b/buildconfigs/linux-defconfig_xen_ia64 index d497060518..51f191d6e8 100644 --- a/buildconfigs/linux-defconfig_xen_ia64 +++ b/buildconfigs/linux-defconfig_xen_ia64 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16.13-xen -# Thu Jun 29 16:23:48 2006 +# Fri Jul 28 16:33:08 2006 # # @@ -92,6 +92,7 @@ CONFIG_EFI=y CONFIG_GENERIC_IOMAP=y CONFIG_XEN=y CONFIG_XEN_IA64_DOM0_VP=y +CONFIG_XEN_IA64_VDSO_PARAVIRT=y CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_IS_DMA32=y # CONFIG_IA64_GENERIC is not set @@ -180,6 +181,8 @@ CONFIG_ACPI_CONTAINER=y # CONFIG_PCI=y CONFIG_PCI_DOMAINS=y +CONFIG_XEN_PCIDEV_FRONTEND=y +# CONFIG_XEN_PCIDEV_FE_DEBUG is not set CONFIG_PCI_LEGACY_PROC=y # CONFIG_PCI_DEBUG is not set @@ -1519,7 +1522,7 @@ CONFIG_XEN_SKBUFF=y CONFIG_XEN_NETDEV_BACKEND=y CONFIG_XEN_NETDEV_FRONTEND=y # CONFIG_XEN_DEVMEM is not set -# CONFIG_XEN_REBOOT is not set +CONFIG_XEN_REBOOT=y # CONFIG_XEN_SMPBOOT is not set CONFIG_XEN_INTERFACE_VERSION=0x00030202 @@ -1529,13 +1532,16 @@ CONFIG_XEN_INTERFACE_VERSION=0x00030202 CONFIG_XEN_PRIVILEGED_GUEST=y # CONFIG_XEN_UNPRIVILEGED_GUEST is not set CONFIG_XEN_PRIVCMD=y +CONFIG_XEN_XENBUS_DEV=y CONFIG_XEN_BACKEND=y -# CONFIG_XEN_PCIDEV_BACKEND is not set CONFIG_XEN_BLKDEV_BACKEND=y -CONFIG_XEN_XENBUS_DEV=y # CONFIG_XEN_BLKDEV_TAP is not set # CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set CONFIG_XEN_NETDEV_LOOPBACK=y +CONFIG_XEN_PCIDEV_BACKEND=y +CONFIG_XEN_PCIDEV_BACKEND_VPCI=y +# CONFIG_XEN_PCIDEV_BACKEND_PASS is not set +# CONFIG_XEN_PCIDEV_BE_DEBUG is not set # CONFIG_XEN_TPMDEV_BACKEND is not set CONFIG_XEN_BLKDEV_FRONTEND=y # CONFIG_XEN_SCRUB_PAGES is not set |