diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2013-08-21 14:44:54 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2013-08-21 14:44:54 +0200 |
| commit | fac778a2b8d6ca953d440baeee72901c2dd5aad9 (patch) | |
| tree | c43d780b5ff8819f4353b16c99601c5ceeeacad7 /arch/ia64/configs/xen_domu_defconfig | |
| parent | 07862c1cd6675cde2dd4bd64e64d704ea2185b79 (diff) | |
| parent | 94fc5d9de5bd757ad46f0d94bc4ebf617c4487f6 (diff) | |
| download | op-kernel-dev-fac778a2b8d6ca953d440baeee72901c2dd5aad9.zip op-kernel-dev-fac778a2b8d6ca953d440baeee72901c2dd5aad9.tar.gz | |
Merge branch 'linus' into timers/core
Reason: Get upstream changes on which new patches depend on.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/ia64/configs/xen_domu_defconfig')
| -rw-r--r-- | arch/ia64/configs/xen_domu_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/configs/xen_domu_defconfig b/arch/ia64/configs/xen_domu_defconfig index 37b9b42..b025acf 100644 --- a/arch/ia64/configs/xen_domu_defconfig +++ b/arch/ia64/configs/xen_domu_defconfig @@ -32,7 +32,7 @@ CONFIG_ACPI_BUTTON=m CONFIG_ACPI_FAN=m CONFIG_ACPI_PROCESSOR=m CONFIG_ACPI_CONTAINER=m -CONFIG_HOTPLUG_PCI=m +CONFIG_HOTPLUG_PCI=y CONFIG_HOTPLUG_PCI_ACPI=m CONFIG_PACKET=y CONFIG_UNIX=y |
