Code Review
/
linux-3.10.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
[linux-3.10.git]
/
arch
/
ia64
/
defconfig
diff --git
a/arch/ia64/defconfig
b/arch/ia64/defconfig
index 2aea0f9e6e1dbdaae7b6ef02785c480ca2ba02b2..7be8096e056159df6ca56a1ff20da01438210c45 100644
(file)
--- a/
arch/ia64/defconfig
+++ b/
arch/ia64/defconfig
@@
-657,6
+657,7
@@
CONFIG_SERIAL_8250_SHARE_IRQ=y
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_SERIAL_SGI_L1_CONSOLE=y
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_SERIAL_SGI_L1_CONSOLE=y
+CONFIG_SERIAL_SGI_IOC4=y
# CONFIG_SERIAL_JSM is not set
CONFIG_UNIX98_PTYS=y
CONFIG_LEGACY_PTYS=y
# CONFIG_SERIAL_JSM is not set
CONFIG_UNIX98_PTYS=y
CONFIG_LEGACY_PTYS=y
@@
-975,6
+976,11
@@
CONFIG_INFINIBAND_MTHCA=m
CONFIG_INFINIBAND_IPOIB=m
# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
CONFIG_INFINIBAND_IPOIB=m
# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
+#
+# SN Devices
+#
+CONFIG_SGI_IOC4=y
+
#
# File systems
#
#
# File systems
#