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
/
zx1_defconfig
diff --git
a/arch/ia64/configs/zx1_defconfig
b/arch/ia64/configs/zx1_defconfig
index d4cf73d124bce959ebb5e346a038de342bf56efa..80b0e9eb7fb3d0ae2852d085f73ce3d2421e2146 100644
(file)
--- a/
arch/ia64/configs/zx1_defconfig
+++ b/
arch/ia64/configs/zx1_defconfig
@@
-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