Mon Jul 11 18:31:10 2011 UTC ()
add emdtv at uhub


(jmcneill)
diff -r1.309 -r1.310 src/sys/arch/i386/conf/ALL
diff -r1.1036 -r1.1037 src/sys/arch/i386/conf/GENERIC
cvs diff -r1.309 -r1.310 src/sys/arch/i386/conf/ALL (expand / switch to unified diff)

--- src/sys/arch/i386/conf/ALL 2011/07/09 15:02:03 1.309
+++ src/sys/arch/i386/conf/ALL 2011/07/11 18:31:10 1.310
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1# $NetBSD: ALL,v 1.309 2011/07/09 15:02:03 jmcneill Exp $ 1# $NetBSD: ALL,v 1.310 2011/07/11 18:31:10 jmcneill Exp $
2# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp 2# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
3# 3#
4# ALL machine description file 4# ALL machine description file
5# 5#
6# This machine description includes all devices and options and it is 6# This machine description includes all devices and options and it is
7# used to compile-test the source and does not necessarily produce a 7# used to compile-test the source and does not necessarily produce a
8# bootable or useful kernel. 8# bootable or useful kernel.
9# 9#
10# For further information on hardware support for this architecture, see 10# For further information on hardware support for this architecture, see
11# the intro(4) man page. For further information about kernel options 11# the intro(4) man page. For further information about kernel options
12# for this architecture, see the options(4) man page. For an explanation 12# for this architecture, see the options(4) man page. For an explanation
13# of each device driver in this file see the section 4 man page for the 13# of each device driver in this file see the section 4 man page for the
14# device. 14# device.
15 15
16include "arch/i386/conf/std.i386" 16include "arch/i386/conf/std.i386"
17 17
18options INCLUDE_CONFIG_FILE # embed config file in kernel binary 18options INCLUDE_CONFIG_FILE # embed config file in kernel binary
19 19
20#ident "ALL-$Revision: 1.309 $" 20#ident "ALL-$Revision: 1.310 $"
21 21
22maxusers 64 # estimated number of users 22maxusers 64 # estimated number of users
23 23
24makeoptions USE_SSP=yes 24makeoptions USE_SSP=yes
25 25
26# CPU-related options. 26# CPU-related options.
27options VM86 # virtual 8086 emulation 27options VM86 # virtual 8086 emulation
28options USER_LDT # user-settable LDT; used by WINE 28options USER_LDT # user-settable LDT; used by WINE
29options X86EMU # 386 Real Mode emulator 29options X86EMU # 386 Real Mode emulator
30options PAE # PAE mode (36 bits physical addressing) 30options PAE # PAE mode (36 bits physical addressing)
31 31
32# CPU features 32# CPU features
33acpicpu* at cpu? # ACPI CPU (including frequency scaling) 33acpicpu* at cpu? # ACPI CPU (including frequency scaling)
@@ -1476,26 +1476,27 @@ gtp* at pci? dev ? function ? # Guillemo @@ -1476,26 +1476,27 @@ gtp* at pci? dev ? function ? # Guillemo
1476# Radio support 1476# Radio support
1477radio* at az? 1477radio* at az?
1478radio* at gtp? 1478radio* at gtp?
1479radio* at rt? 1479radio* at rt?
1480radio* at rtii? 1480radio* at rtii?
1481radio* at sf2r? 1481radio* at sf2r?
1482 1482
1483 1483
1484# Video capture devices 1484# Video capture devices
1485 1485
1486pseye* at uhub? # Sony PLAYSTATION(R) Eye webcam 1486pseye* at uhub? # Sony PLAYSTATION(R) Eye webcam
1487uvideo* at uhub? # USB Video Class capture devices 1487uvideo* at uhub? # USB Video Class capture devices
1488auvitek* at uhub? # Auvitek AU0828 video capture devices 1488auvitek* at uhub? # Auvitek AU0828 video capture devices
 1489emdtv* at uhub? # Empia EM28xx video capture devices
1489video* at videobus? 1490video* at videobus?
1490dtv* at dtvbus? 1491dtv* at dtvbus?
1491 1492
1492 1493
1493# TV cards 1494# TV cards
1494 1495
1495# Brooktree 848/849/878/879 based TV cards 1496# Brooktree 848/849/878/879 based TV cards
1496bktr* at pci? dev ? function ? 1497bktr* at pci? dev ? function ?
1497radio* at bktr? 1498radio* at bktr?
1498 1499
1499isv* at isa? port 0x3e0 # IDEC Supervision/16 image capture 1500isv* at isa? port 0x3e0 # IDEC Supervision/16 image capture
1500 1501
1501# Bluetooth Controller and Device support 1502# Bluetooth Controller and Device support
cvs diff -r1.1036 -r1.1037 src/sys/arch/i386/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/i386/conf/GENERIC 2011/07/09 15:02:43 1.1036
+++ src/sys/arch/i386/conf/GENERIC 2011/07/11 18:31:10 1.1037
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: GENERIC,v 1.1036 2011/07/09 15:02:43 jmcneill Exp $ 1# $NetBSD: GENERIC,v 1.1037 2011/07/11 18:31:10 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.1036 $" 25#ident "GENERIC-$Revision: 1.1037 $"
26 26
27maxusers 64 # estimated number of users 27maxusers 64 # estimated number of users
28 28
29# For GENERIC, we build the exec formats as module(7)s by default. 29# For GENERIC, we build the exec formats as module(7)s by default.
30no options EXEC_AOUT # exec a.out binaries 30no options EXEC_AOUT # exec a.out binaries
31no options EXEC_ELF32 # exec ELF binaries 31no options EXEC_ELF32 # exec ELF binaries
32no options EXEC_SCRIPT # exec #! scripts 32no options EXEC_SCRIPT # exec #! scripts
33no options COREDUMP 33no options COREDUMP
34 34
35# CPU-related options. 35# CPU-related options.
36options VM86 # virtual 8086 emulation 36options VM86 # virtual 8086 emulation
37options USER_LDT # user-settable LDT; used by WINE 37options USER_LDT # user-settable LDT; used by WINE
38#options PAE # PAE mode (36 bits physical addressing) 38#options PAE # PAE mode (36 bits physical addressing)
@@ -1413,26 +1413,27 @@ midi* at pcppi? # MIDI interface to the @@ -1413,26 +1413,27 @@ midi* at pcppi? # MIDI interface to the
1413# Radio support 1413# Radio support
1414#radio* at az? 1414#radio* at az?
1415#radio* at gtp? 1415#radio* at gtp?
1416#radio* at rt? 1416#radio* at rt?
1417#radio* at rtii? 1417#radio* at rtii?
1418#radio* at sf2r? 1418#radio* at sf2r?
1419 1419
1420 1420
1421# Video capture devices 1421# Video capture devices
1422 1422
1423pseye* at uhub? # Sony PLAYSTATION(R) Eye webcam 1423pseye* at uhub? # Sony PLAYSTATION(R) Eye webcam
1424uvideo* at uhub? # USB Video Class capture devices 1424uvideo* at uhub? # USB Video Class capture devices
1425auvitek* at uhub? # Auvitek AU0828 video capture devices 1425auvitek* at uhub? # Auvitek AU0828 video capture devices
 1426emdtv* at uhub? # Empia EM28xx video capture devices
1426video* at videobus? 1427video* at videobus?
1427dtv* at dtvbus? 1428dtv* at dtvbus?
1428 1429
1429 1430
1430# TV cards 1431# TV cards
1431 1432
1432# Brooktree 848/849/878/879 based TV cards 1433# Brooktree 848/849/878/879 based TV cards
1433bktr* at pci? dev ? function ? 1434bktr* at pci? dev ? function ?
1434radio* at bktr? 1435radio* at bktr?
1435 1436
1436 1437
1437# Bluetooth Controller and Device support 1438# Bluetooth Controller and Device support
1438 1439