---

yaml --- r: 44235 b: refs/heads/master c: 74e95d5 h: refs/heads/master i: 44233: 068743a 44231: 5ac407f v: v3
git-mirror · Dec 11, 2006 · b07baff · b07baff
1 parent c5392e4
commit b07baff
Show file tree

Hide file tree

Showing 6 changed files with 1,073 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0204568a088fecd5478153504f9476ee2c46d5bf
+refs/heads/master: 74e95d5de9d8eb243cda68b546bdb29f6ef0f01c
diff --git a/trunk/arch/powerpc/configs/ps3_defconfig b/trunk/arch/powerpc/configs/ps3_defconfig
@@ -157,6 +157,7 @@ CONFIG_SPU_BASE=y
 CONFIG_PS3_HTAB_SIZE=20
 CONFIG_PS3_DYNAMIC_DMA=y
 CONFIG_PS3_USE_LPAR_ADDR=y
+CONFIG_PS3_VUART=y
 
 #
 # Kernel options

diff --git a/trunk/arch/powerpc/platforms/ps3/Kconfig b/trunk/arch/powerpc/platforms/ps3/Kconfig
@@ -40,4 +40,15 @@ config PS3_USE_LPAR_ADDR
 
 	  If you have any doubt, choose the default y.
 
+config PS3_VUART
+	depends on PPC_PS3
+	bool "PS3 Virtual UART support"
+	default y
+	help
+	  Include support for the PS3 Virtual UART.
+
+	  This support is required for several system services
+	  including the System Manager and AV Settings.  In
+	  general, all users will say Y.
+
 endmenu
diff --git a/trunk/drivers/ps3/Makefile b/trunk/drivers/ps3/Makefile
@@ -1 +1,2 @@
 obj-y += system-bus.o
+obj-$(CONFIG_PS3_VUART) += vuart.o
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		obj-y += system-bus.o
		obj-$(CONFIG_PS3_VUART) += vuart.o