diff options
| author | Jiang Liu <jiang.liu@linux.intel.com> | 2014-02-17 13:59:30 +0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2014-02-28 11:02:18 -0800 |
| commit | d21114236d0e1232023cb8c84bd29e06810f6a2f (patch) | |
| tree | 8fbcd83d7c3f6e083e5fef93ca3d1377e102a673 /arch/ia64 | |
| parent | f3ffaaa8b727da6c442b5b8cb356c2196b6e2d59 (diff) | |
| download | linux-d21114236d0e1232023cb8c84bd29e06810f6a2f.tar.bz2 | |
Fix warning in make defconfig
Now the ACPI container and ACPI PCI hotplug driver has been converted
as built-in modules, so reflect these changes in IA64 defconfig file.
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/configs/generic_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/configs/generic_defconfig b/arch/ia64/configs/generic_defconfig index efbd2929aeb7..6404acbb84b2 100644 --- a/arch/ia64/configs/generic_defconfig +++ b/arch/ia64/configs/generic_defconfig @@ -30,9 +30,9 @@ CONFIG_ACPI_BUTTON=m CONFIG_ACPI_FAN=m CONFIG_ACPI_DOCK=y CONFIG_ACPI_PROCESSOR=m -CONFIG_ACPI_CONTAINER=m +CONFIG_ACPI_CONTAINER=y CONFIG_HOTPLUG_PCI=y -CONFIG_HOTPLUG_PCI_ACPI=m +CONFIG_HOTPLUG_PCI_ACPI=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y |