diff options
| author | nwhitehorn <nwhitehorn@FreeBSD.org> | 2011-06-11 12:34:08 +0000 |
|---|---|---|
| committer | nwhitehorn <nwhitehorn@FreeBSD.org> | 2011-06-11 12:34:08 +0000 |
| commit | 820661759dae361df907bef9e8f264082689ad81 (patch) | |
| tree | c7c9fe765f901ea328195fa7602f5939a8c24aff /sys/powerpc | |
| parent | 6b76ad6c12311f0ab033abef6ff073f2dc3149a3 (diff) | |
| download | FreeBSD-src-820661759dae361df907bef9e8f264082689ad81.zip FreeBSD-src-820661759dae361df907bef9e8f264082689ad81.tar.gz | |
Follow up r222980 on PowerPC: add sound(4) and common device drivers
to PowerPC GENERIC (along with a small rearrangement).
Diffstat (limited to 'sys/powerpc')
| -rw-r--r-- | sys/powerpc/conf/GENERIC | 12 | ||||
| -rw-r--r-- | sys/powerpc/conf/GENERIC64 | 11 |
2 files changed, 15 insertions, 8 deletions
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC index 54d4639..2950a49 100644 --- a/sys/powerpc/conf/GENERIC +++ b/sys/powerpc/conf/GENERIC @@ -174,7 +174,9 @@ device sbp # SCSI over FireWire (Requires scbus and da) 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 diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64 index ab4a0dc..7e385a1 100644 --- a/sys/powerpc/conf/GENERIC64 +++ b/sys/powerpc/conf/GENERIC64 @@ -175,7 +175,9 @@ device sbp # SCSI over FireWire (Requires scbus and da) 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 Unit 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 |
