]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4e93d3e 29516d7)
Merge kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 22 Jun 2005 19:22:12 +0000 (12:22 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 22 Jun 2005 19:22:12 +0000 (12:22 -0700)
Do arch/ia64/defconfig by hand.

1  2 
arch/ia64/Kconfig patch | diff1 | diff2 | blob | history
arch/ia64/defconfig patch | diff1 | diff2 | blob | history

diff --cc arch/ia64/Kconfig
Simple merge
diff --cc arch/ia64/defconfig
index 9997ef45ab237b19a09238fee673ba17b4388950,2aea0f9e6e1dbdaae7b6ef02785c480ca2ba02b2..7be8096e056159df6ca56a1ff20da01438210c45
--- 1/arch/ia64/defconfig
--- 2/arch/ia64/defconfig
+++ b/arch/ia64/defconfig
@@@ -638,7 -657,7 +657,8 @@@ CONFIG_SERIAL_8250_SHARE_IRQ=
  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_LEGACY_PTY_COUNT=256
Linux 2.6 source tree