svn commit: r222982 - head/sys/powerpc/conf

[Nathan Whitehorn]

Author: nwhitehorn
Date: Sat Jun 11 12:34:08 2011
New Revision: 222982
URL: http://svn.freebsd.org/changeset/base/222982

Log:
  Follow up r222980 on PowerPC: add sound(4) and common device drivers
  to PowerPC GENERIC (along with a small rearrangement).

Modified:
  head/sys/powerpc/conf/GENERIC
  head/sys/powerpc/conf/GENERIC64

Modified: head/sys/powerpc/conf/GENERIC
==============================================================================
--- head/sys/powerpc/conf/GENERIC	Sat Jun 11 10:35:53 2011	(r222981)
+++ head/sys/powerpc/conf/GENERIC	Sat Jun 11 12:34:08 2011	(r222982)
@@ -174,7 +174,9 @@ device		sbp		# SCSI over FireWire (Requi
 device		fwe		# Ethernet over FireWire (non-standard!)
 
 # Misc
-device          ad7417          # PowerMac7,2 temperature sensor
+device		iicbus		# I2C bus code
+device		kiic		# Keywest I2C
+device		ad7417		# PowerMac7,2 temperature sensor
 device		ds1775		# PowerMac7,2 temperature sensor
 device		fcu		# Apple Fan Control Unit
 device		max6690		# PowerMac7,2 temperature sensor
@@ -187,7 +189,9 @@ device		adb
 device		cuda
 device		pmu
 
-# Powermac I2C support
-device		iicbus		# I2C bus code
-device		kiic		# Keywest I2C
+# Sound support
+device		sound		# Generic sound driver (required)
+device		snd_ai2s	# Apple I2S audio
+device		snd_davbus	# Apple DAVBUS audio
+device		snd_uaudio	# USB Audio
 

Modified: head/sys/powerpc/conf/GENERIC64
==============================================================================
--- head/sys/powerpc/conf/GENERIC64	Sat Jun 11 10:35:53 2011	(r222981)
+++ head/sys/powerpc/conf/GENERIC64	Sat Jun 11 12:34:08 2011	(r222982)
@@ -175,7 +175,9 @@ device		sbp		# SCSI over FireWire (Requi
 device		fwe		# Ethernet over FireWire (non-standard!)
 
 # Misc
-device          ad7417          # PowerMac7,2 temperature sensor
+device		iicbus		# I2C bus code
+device		kiic		# Keywest I2C
+device		ad7417		# PowerMac7,2 temperature sensor
 device		ds1775		# PowerMac7,2 temperature sensor
 device		fcu		# Apple Fan Control Unit
 device		max6690		# PowerMac7,2 temperature sensor
@@ -186,7 +188,8 @@ device		smu		# Apple System Management U
 device		adb
 device		pmu
 
-# Powermac I2C support
-device		iicbus		# I2C bus code
-device		kiic		# Keywest I2C
+# Sound support
+device		sound		# Generic sound driver (required)
+device		snd_ai2s	# Apple I2S audio
+device		snd_uaudio	# USB Audio