diff options
| author | marius <marius@FreeBSD.org> | 2011-06-13 12:45:19 +0000 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2011-06-13 12:45:19 +0000 |
| commit | 056c5ee0f632afb0c54e55dedc469ea722e37ab0 (patch) | |
| tree | 8eddca36b8ab9c4a38f365609108c4ec912e7dff /sys/sparc64 | |
| parent | 9618d7033ccc310c2871e38dfa865bc614e0f0f7 (diff) | |
| download | FreeBSD-src-056c5ee0f632afb0c54e55dedc469ea722e37ab0.zip FreeBSD-src-056c5ee0f632afb0c54e55dedc469ea722e37ab0.tar.gz | |
- Merge r222980 from x86: add sound(4) and common device drivers.
- Fix whitespace.
Diffstat (limited to 'sys/sparc64')
| -rw-r--r-- | sys/sparc64/conf/GENERIC | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC index 406dcf6..11c5d35 100644 --- a/sys/sparc64/conf/GENERIC +++ b/sys/sparc64/conf/GENERIC @@ -61,13 +61,13 @@ options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed. options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing options MAC # TrustedBSD MAC Framework -options INCLUDE_CONFIG_FILE # Include this file in kernel +options INCLUDE_CONFIG_FILE # Include this file in kernel # Debugging for use in -current options KDB # Enable kernel debugger support. options DDB # Support DDB. options GDB # Support remote GDB. -options DEADLKRES # Enable the deadlock resolver +options DEADLKRES # Enable the deadlock resolver options INVARIANTS # Enable calls of extra sanity checking options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS options WITNESS # Enable checks to detect deadlocks and cycles @@ -266,3 +266,10 @@ device fwe # Ethernet over FireWire (non-standard!) device fwip # IP over FireWire (RFC 2734,3146) device dcons # Dumb console driver device dcons_crom # Configuration ROM for dcons + +# Sound support +device sound # Generic sound driver (required) +device snd_audiocs # Crystal Semiconductor CS4231 +device snd_es137x # Ensoniq AudioPCI ES137x +device snd_t4dwave # Acer Labs M5451 +device snd_uaudio # USB Audio |
