Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d301a9f3 authored Mar 11, 2009 by Benjamin Herrenschmidt

Merge commit 'gcl/merge' into merge

parents ed75d863 6b8036a8

arch/powerpc/configs/40x/virtex_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -686,7 +686,7 @@ CONFIG_SERIAL_UARTLITE_CONSOLE=y
		CONFIG_SERIAL_CORE=y
		CONFIG_SERIAL_CORE_CONSOLE=y
		# CONFIG_SERIAL_JSM is not set
		# CONFIG_SERIAL_OF_PLATFORM is not set
		CONFIG_SERIAL_OF_PLATFORM=y
		# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
		CONFIG_UNIX98_PTYS=y
		# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set

arch/powerpc/configs/44x/virtex5_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -691,7 +691,7 @@ CONFIG_SERIAL_UARTLITE_CONSOLE=y
		CONFIG_SERIAL_CORE=y
		CONFIG_SERIAL_CORE_CONSOLE=y
		# CONFIG_SERIAL_JSM is not set
		# CONFIG_SERIAL_OF_PLATFORM is not set
		CONFIG_SERIAL_OF_PLATFORM=y
		# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
		CONFIG_UNIX98_PTYS=y
		# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set