projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[IA64] Manual merge fix for 3 files
[firefly-linux-kernel-4.4.55.git]
/
arch
/
ia64
/
configs
/
sn2_defconfig
diff --git
a/arch/ia64/configs/sn2_defconfig
b/arch/ia64/configs/sn2_defconfig
index 1ca6e6e11b42f51c488bbf448f49df4eaf7e03dd..08112ab384686d9e204b31f40f1126a7550e7e71 100644
(file)
--- 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