ia64/xen-unstable
changeset 3886:7d8023fc0b68
bitkeeper revision 1.1230.3.1 (421a9560ig3FHldRnXtbmBVMnR-V9Q)
manual merge
manual merge
author | iap10@freefall.cl.cam.ac.uk |
---|---|
date | Tue Feb 22 02:13:52 2005 +0000 (2005-02-22) |
parents | 21d06c9e4db5 73c3313f21d3 |
children | 4385894c52ae |
files | linux-2.6.10-xen-sparse/arch/xen/configs/xen0_defconfig patches/linux-2.6.10/agpgart.patch |
line diff
1.1 --- a/linux-2.6.10-xen-sparse/arch/xen/configs/xen0_defconfig Mon Feb 21 11:31:57 2005 +0000 1.2 +++ b/linux-2.6.10-xen-sparse/arch/xen/configs/xen0_defconfig Tue Feb 22 02:13:52 2005 +0000 1.3 @@ -21,9 +21,9 @@ CONFIG_XEN_NETDEV_FRONTEND=y 1.4 # CONFIG_XEN_BLKDEV_TAP is not set 1.5 CONFIG_XEN_WRITABLE_PAGETABLES=y 1.6 CONFIG_XEN_SCRUB_PAGES=y 1.7 -CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y 1.8 CONFIG_X86=y 1.9 # CONFIG_X86_64 is not set 1.10 +CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y 1.11 1.12 # 1.13 # Code maturity level options 1.14 @@ -50,7 +50,6 @@ CONFIG_KOBJECT_UEVENT=y 1.15 # CONFIG_IKCONFIG is not set 1.16 # CONFIG_EMBEDDED is not set 1.17 CONFIG_KALLSYMS=y 1.18 -# CONFIG_KALLSYMS_ALL is not set 1.19 # CONFIG_KALLSYMS_EXTRA_PASS is not set 1.20 CONFIG_FUTEX=y 1.21 CONFIG_EPOLL=y 1.22 @@ -187,7 +186,6 @@ CONFIG_BINFMT_ELF=y 1.23 # CONFIG_STANDALONE is not set 1.24 CONFIG_PREVENT_FIRMWARE_BUILD=y 1.25 # CONFIG_FW_LOADER is not set 1.26 -# CONFIG_DEBUG_DRIVER is not set 1.27 1.28 # 1.29 # Memory Technology Devices (MTD) 1.30 @@ -803,8 +801,28 @@ CONFIG_LEGACY_PTY_COUNT=256 1.31 # Ftape, the floppy tape device driver 1.32 # 1.33 # CONFIG_FTAPE is not set 1.34 -# CONFIG_AGP is not set 1.35 -# CONFIG_DRM is not set 1.36 +CONFIG_AGP=m 1.37 +CONFIG_AGP_ALI=m 1.38 +CONFIG_AGP_ATI=m 1.39 +CONFIG_AGP_AMD=m 1.40 +CONFIG_AGP_AMD64=m 1.41 +CONFIG_AGP_INTEL=m 1.42 +CONFIG_AGP_INTEL_MCH=m 1.43 +CONFIG_AGP_NVIDIA=m 1.44 +CONFIG_AGP_SIS=m 1.45 +CONFIG_AGP_SWORKS=m 1.46 +CONFIG_AGP_VIA=m 1.47 +# CONFIG_AGP_EFFICEON is not set 1.48 +CONFIG_DRM=y 1.49 +CONFIG_DRM_TDFX=m 1.50 +# CONFIG_DRM_GAMMA is not set 1.51 +CONFIG_DRM_R128=m 1.52 +CONFIG_DRM_RADEON=m 1.53 +CONFIG_DRM_I810=m 1.54 +CONFIG_DRM_I830=m 1.55 +CONFIG_DRM_I915=m 1.56 +CONFIG_DRM_MGA=m 1.57 +CONFIG_DRM_SIS=m 1.58 # CONFIG_MWAVE is not set 1.59 # CONFIG_RAW_DRIVER is not set 1.60 # CONFIG_HANGCHECK_TIMER is not set