diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-12-20 22:39:47 (GMT) |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-12-20 22:39:47 (GMT) |
commit | 55fa518867978e1f5fd8353098f80d125ac734d7 (patch) | |
tree | 3502b331c1f9ec4cac25dc8ba30b6a0a324e350c /arch/ia64/configs/generic_defconfig | |
parent | bb1f24bf00a85f666b56a09b7cdbfd221af16c2c (diff) | |
parent | eea0579fc85e64e9f05361d5aacf496fe7a151aa (diff) | |
download | linux-55fa518867978e1f5fd8353098f80d125ac734d7.tar.xz |
Merge branch 'topic/pcsp-fix' into topic/misc
Diffstat (limited to 'arch/ia64/configs/generic_defconfig')
-rw-r--r-- | arch/ia64/configs/generic_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ia64/configs/generic_defconfig b/arch/ia64/configs/generic_defconfig index 9f48397..e05f9e1 100644 --- a/arch/ia64/configs/generic_defconfig +++ b/arch/ia64/configs/generic_defconfig @@ -233,6 +233,8 @@ CONFIG_DMIID=y CONFIG_BINFMT_ELF=y CONFIG_BINFMT_MISC=m +# CONFIG_DMAR is not set + # # Power management and ACPI # |