Tue Sep 9 01:19:37 2008 UTC ()
Add uvideo(4)


(jmcneill)
diff -r1.907 -r1.908 src/sys/arch/i386/conf/GENERIC

cvs diff -r1.907 -r1.908 src/sys/arch/i386/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/i386/conf/GENERIC 2008/09/07 12:01:25 1.907
+++ src/sys/arch/i386/conf/GENERIC 2008/09/09 01:19:37 1.908
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: GENERIC,v 1.907 2008/09/07 12:01:25 tron Exp $ 1# $NetBSD: GENERIC,v 1.908 2008/09/09 01:19:37 jmcneill Exp $
2# 2#
3# GENERIC machine description file 3# GENERIC machine description file
4# 4#
5# This machine description file is used to generate the default NetBSD 5# This machine description file is used to generate the default NetBSD
6# kernel. The generic kernel does not include all options, subsystems 6# kernel. The generic kernel does not include all options, subsystems
7# and device drivers, but should be useful for most applications. 7# and device drivers, but should be useful for most applications.
8# 8#
9# The machine description file can be customised for your specific 9# The machine description file can be customised for your specific
10# machine to reduce the kernel size and improve its performance. 10# machine to reduce the kernel size and improve its performance.
11# 11#
12# For further information on compiling NetBSD kernels, see the config(8) 12# For further information on compiling NetBSD kernels, see the config(8)
13# man page. 13# man page.
14# 14#
15# For further information on hardware support for this architecture, see 15# For further information on hardware support for this architecture, see
16# the intro(4) man page. For further information about kernel options 16# the intro(4) man page. For further information about kernel options
17# for this architecture, see the options(4) man page. For an explanation 17# for this architecture, see the options(4) man page. For an explanation
18# of each device driver in this file see the section 4 man page for the 18# of each device driver in this file see the section 4 man page for the
19# device. 19# device.
20 20
21include "arch/i386/conf/std.i386" 21include "arch/i386/conf/std.i386"
22 22
23options INCLUDE_CONFIG_FILE # embed config file in kernel binary 23options INCLUDE_CONFIG_FILE # embed config file in kernel binary
24 24
25#ident "GENERIC-$Revision: 1.907 $" 25#ident "GENERIC-$Revision: 1.908 $"
26 26
27maxusers 64 # estimated number of users 27maxusers 64 # estimated number of users
28 28
29makeoptions CPUFLAGS="-march=i486 -mtune=pentiumpro" # Assume at least 486, 29makeoptions CPUFLAGS="-march=i486 -mtune=pentiumpro" # Assume at least 486,
30 # tune for more modern 30 # tune for more modern
31 31
32# CPU-related options. 32# CPU-related options.
33options VM86 # virtual 8086 emulation 33options VM86 # virtual 8086 emulation
34options USER_LDT # user-settable LDT; used by WINE 34options USER_LDT # user-settable LDT; used by WINE
35 35
36# Enhanced SpeedStep Technology in the Pentium M 36# Enhanced SpeedStep Technology in the Pentium M
37options ENHANCED_SPEEDSTEP 37options ENHANCED_SPEEDSTEP
38#options EST_FREQ_USERWRITE # any user can set frequency 38#options EST_FREQ_USERWRITE # any user can set frequency
@@ -1328,26 +1328,27 @@ midi* at pcppi? # MIDI interface to the @@ -1328,26 +1328,27 @@ midi* at pcppi? # MIDI interface to the
1328#gtp* at pci? dev ? function ? # Guillemot Maxi Radio FM 2000 Radio Card 1328#gtp* at pci? dev ? function ? # Guillemot Maxi Radio FM 2000 Radio Card
1329 1329
1330# Radio support 1330# Radio support
1331#radio* at az? 1331#radio* at az?
1332#radio* at gtp? 1332#radio* at gtp?
1333#radio* at rt? 1333#radio* at rt?
1334#radio* at rtii? 1334#radio* at rtii?
1335#radio* at sf2r? 1335#radio* at sf2r?
1336 1336
1337 1337
1338# Video capture devices 1338# Video capture devices
1339 1339
1340pseye* at uhub? # Sony PLAYSTATION(R) Eye webcam 1340pseye* at uhub? # Sony PLAYSTATION(R) Eye webcam
 1341uvideo* at uhub? # USB Video Class capture devices
1341video* at videobus? 1342video* at videobus?
1342 1343
1343 1344
1344# TV cards 1345# TV cards
1345 1346
1346# Brooktree 848/849/878/879 based TV cards 1347# Brooktree 848/849/878/879 based TV cards
1347bktr* at pci? dev ? function ? 1348bktr* at pci? dev ? function ?
1348radio* at bktr? 1349radio* at bktr?
1349 1350
1350 1351
1351# Bluetooth Controller and Device support 1352# Bluetooth Controller and Device support
1352 1353
1353# Bluetooth PCMCIA Controllers 1354# Bluetooth PCMCIA Controllers