ia64/xen-unstable

changeset 9643:886594fa3aef

Build CONFIG_PNP_ACPI by default.

Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Sat Apr 08 12:10:04 2006 +0100 (2006-04-08)
parents e36892ad4144
children 81bc9e9fb40d
files buildconfigs/linux-defconfig_xen0_x86_32 buildconfigs/linux-defconfig_xen0_x86_64 buildconfigs/linux-defconfig_xen_x86_32 buildconfigs/linux-defconfig_xen_x86_64
line diff
     1.1 --- a/buildconfigs/linux-defconfig_xen0_x86_32	Sat Apr 08 12:09:25 2006 +0100
     1.2 +++ b/buildconfigs/linux-defconfig_xen0_x86_32	Sat Apr 08 12:10:04 2006 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  #
     1.5  # Automatically generated make config: don't edit
     1.6 -# Linux kernel version: 2.6.16-rc3-xen0
     1.7 -# Thu Feb 16 22:52:42 2006
     1.8 +# Linux kernel version: 2.6.16-xen0
     1.9 +# Sat Apr  8 11:34:07 2006
    1.10  #
    1.11  CONFIG_X86_32=y
    1.12  CONFIG_SEMAPHORE_SLEEPERS=y
    1.13 @@ -208,7 +208,6 @@ CONFIG_ACPI_BLACKLIST_YEAR=0
    1.14  CONFIG_ACPI_EC=y
    1.15  CONFIG_ACPI_POWER=y
    1.16  CONFIG_ACPI_SYSTEM=y
    1.17 -# CONFIG_X86_PM_TIMER is not set
    1.18  # CONFIG_ACPI_CONTAINER is not set
    1.19  
    1.20  #
    1.21 @@ -392,7 +391,13 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
    1.22  #
    1.23  # Plug and Play support
    1.24  #
    1.25 -# CONFIG_PNP is not set
    1.26 +CONFIG_PNP=y
    1.27 +CONFIG_PNP_DEBUG=y
    1.28 +
    1.29 +#
    1.30 +# Protocols
    1.31 +#
    1.32 +CONFIG_PNPACPI=y
    1.33  
    1.34  #
    1.35  # Block devices
    1.36 @@ -440,6 +445,7 @@ CONFIG_BLK_DEV_IDECD=y
    1.37  #
    1.38  CONFIG_IDE_GENERIC=y
    1.39  # CONFIG_BLK_DEV_CMD640 is not set
    1.40 +# CONFIG_BLK_DEV_IDEPNP is not set
    1.41  CONFIG_BLK_DEV_IDEPCI=y
    1.42  # CONFIG_IDEPCI_SHARE_IRQ is not set
    1.43  # CONFIG_BLK_DEV_OFFBOARD is not set
    1.44 @@ -623,6 +629,7 @@ CONFIG_NETDEVICES=y
    1.45  # CONFIG_BONDING is not set
    1.46  # CONFIG_EQUALIZER is not set
    1.47  CONFIG_TUN=y
    1.48 +# CONFIG_NET_SB1000 is not set
    1.49  
    1.50  #
    1.51  # ARCnet devices
    1.52 @@ -1064,11 +1071,7 @@ CONFIG_USB_MON=y
    1.53  # CONFIG_INFINIBAND is not set
    1.54  
    1.55  #
    1.56 -# SN Devices
    1.57 -#
    1.58 -
    1.59 -#
    1.60 -# EDAC - error detection and reporting (RAS)
    1.61 +# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
    1.62  #
    1.63  # CONFIG_EDAC is not set
    1.64  
    1.65 @@ -1306,7 +1309,7 @@ CONFIG_CRYPTO_CRC32C=m
    1.66  #
    1.67  # CONFIG_CRYPTO_DEV_PADLOCK is not set
    1.68  CONFIG_XEN=y
    1.69 -CONFIG_NO_IDLE_HZ=y
    1.70 +CONFIG_XEN_INTERFACE_VERSION=0x00030101
    1.71  
    1.72  #
    1.73  # XEN
    1.74 @@ -1332,6 +1335,7 @@ CONFIG_XEN_DISABLE_SERIAL=y
    1.75  CONFIG_XEN_SYSFS=y
    1.76  CONFIG_HAVE_ARCH_ALLOC_SKB=y
    1.77  CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y
    1.78 +CONFIG_NO_IDLE_HZ=y
    1.79  
    1.80  #
    1.81  # Library routines
    1.82 @@ -1344,4 +1348,6 @@ CONFIG_ZLIB_INFLATE=y
    1.83  CONFIG_GENERIC_HARDIRQS=y
    1.84  CONFIG_GENERIC_IRQ_PROBE=y
    1.85  CONFIG_X86_BIOS_REBOOT=y
    1.86 +CONFIG_X86_NO_TSS=y
    1.87 +CONFIG_X86_NO_IDT=y
    1.88  CONFIG_KTIME_SCALAR=y
     2.1 --- a/buildconfigs/linux-defconfig_xen0_x86_64	Sat Apr 08 12:09:25 2006 +0100
     2.2 +++ b/buildconfigs/linux-defconfig_xen0_x86_64	Sat Apr 08 12:10:04 2006 +0100
     2.3 @@ -327,7 +327,13 @@ CONFIG_STANDALONE=y
     2.4  #
     2.5  # Plug and Play support
     2.6  #
     2.7 -# CONFIG_PNP is not set
     2.8 +CONFIG_PNP=y
     2.9 +CONFIG_PNP_DEBUG=y
    2.10 +
    2.11 +#
    2.12 +# Protocols
    2.13 +#
    2.14 +CONFIG_PNPACPI=y
    2.15  
    2.16  #
    2.17  # Block devices
     3.1 --- a/buildconfigs/linux-defconfig_xen_x86_32	Sat Apr 08 12:09:25 2006 +0100
     3.2 +++ b/buildconfigs/linux-defconfig_xen_x86_32	Sat Apr 08 12:10:04 2006 +0100
     3.3 @@ -912,12 +912,12 @@ CONFIG_PARPORT_1284=y
     3.4  # Plug and Play support
     3.5  #
     3.6  CONFIG_PNP=y
     3.7 -# CONFIG_PNP_DEBUG is not set
     3.8 +CONFIG_PNP_DEBUG=y
     3.9  
    3.10  #
    3.11  # Protocols
    3.12  #
    3.13 -# CONFIG_PNPACPI is not set
    3.14 +CONFIG_PNPACPI=y
    3.15  
    3.16  #
    3.17  # Block devices
     4.1 --- a/buildconfigs/linux-defconfig_xen_x86_64	Sat Apr 08 12:09:25 2006 +0100
     4.2 +++ b/buildconfigs/linux-defconfig_xen_x86_64	Sat Apr 08 12:10:04 2006 +0100
     4.3 @@ -776,7 +776,13 @@ CONFIG_PARPORT_1284=y
     4.4  #
     4.5  # Plug and Play support
     4.6  #
     4.7 -# CONFIG_PNP is not set
     4.8 +CONFIG_PNP=y
     4.9 +CONFIG_PNP_DEBUG=y
    4.10 +
    4.11 +#
    4.12 +# Protocols
    4.13 +#
    4.14 +CONFIG_PNPACPI=y
    4.15  
    4.16  #
    4.17  # Block devices