From: awilliam@xenbuild2.aw Date: Wed, 31 Jan 2007 17:30:54 +0000 (-0700) Subject: merge with xen-unstable.hg X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15368 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8e36c6490cab47a5b4acbd480a9f30f36d21fd6f;p=xen.git merge with xen-unstable.hg --- 8e36c6490cab47a5b4acbd480a9f30f36d21fd6f diff --cc buildconfigs/linux-defconfig_xen0_ia64 index 782c1f4925,84fa7c7abb..9869aab066 --- a/buildconfigs/linux-defconfig_xen0_ia64 +++ b/buildconfigs/linux-defconfig_xen0_ia64 @@@ -1639,10 -1536,9 +1639,10 @@@ CONFIG_XEN_PCIDEV_BACKEND= # CONFIG_XEN_PCIDEV_BACKEND_PASS is not set CONFIG_XEN_PCIDEV_BACKEND_SLOT=y # CONFIG_XEN_PCIDEV_BE_DEBUG is not set - # CONFIG_XEN_TPMDEV_BACKEND is not set + CONFIG_XEN_TPMDEV_BACKEND=m CONFIG_XEN_BLKDEV_FRONTEND=y CONFIG_XEN_NETDEV_FRONTEND=y +# CONFIG_XEN_FRAMEBUFFER is not set # CONFIG_XEN_SCRUB_PAGES is not set CONFIG_XEN_DISABLE_SERIAL=y CONFIG_XEN_SYSFS=y