aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/configs/sn2_defconfig
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@hera.kernel.org>2005-09-09 08:19:10 -0700
committerAnton Altaparmakov <aia21@hera.kernel.org>2005-09-09 08:19:10 -0700
commitddcc95963449d028b16d9b9fe50f6e91ce7d9e81 (patch)
treeaaf0392346a18b3e232ddeb5db3c4e917f7ca686 /arch/ia64/configs/sn2_defconfig
parent223176bc722a7bf519904180e956292ae1d1e819 (diff)
parent5f5024130287a9467a41b9f94ec170958ae45cbd (diff)
downloadkernel_samsung_smdk4412-ddcc95963449d028b16d9b9fe50f6e91ce7d9e81.tar.gz
kernel_samsung_smdk4412-ddcc95963449d028b16d9b9fe50f6e91ce7d9e81.tar.bz2
kernel_samsung_smdk4412-ddcc95963449d028b16d9b9fe50f6e91ce7d9e81.zip
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/ia64/configs/sn2_defconfig')
-rw-r--r--arch/ia64/configs/sn2_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ia64/configs/sn2_defconfig b/arch/ia64/configs/sn2_defconfig
index 1ca6e6e11b4..08112ab3846 100644
--- a/arch/ia64/configs/sn2_defconfig
+++ b/arch/ia64/configs/sn2_defconfig
@@ -111,7 +111,6 @@ CONFIG_COMPAT=y
CONFIG_IA64_MCA_RECOVERY=y
CONFIG_PERFMON=y
CONFIG_IA64_PALINFO=y
-CONFIG_ACPI_DEALLOCATE_IRQ=y
#
# Firmware Drivers