[IA64] Manual merge fix for 3 files
[linux-2.6.git] / arch / ia64 / configs / zx1_defconfig
index d4cf73d..80b0e9e 100644 (file)
@@ -109,7 +109,6 @@ CONFIG_COMPAT=y
 CONFIG_IA64_MCA_RECOVERY=y
 CONFIG_PERFMON=y
 CONFIG_IA64_PALINFO=y
-CONFIG_ACPI_DEALLOCATE_IRQ=y
 
 #
 # Firmware Drivers