Wed Nov 3 20:10:01 2010 UTC ()
add otus


(christos)
diff -r1.270 -r1.271 src/sys/arch/i386/conf/ALL
diff -r1.995 -r1.996 src/sys/arch/i386/conf/GENERIC
cvs diff -r1.270 -r1.271 src/sys/arch/i386/conf/ALL (expand / switch to unified diff)

--- src/sys/arch/i386/conf/ALL 2010/10/24 09:27:45 1.270
+++ src/sys/arch/i386/conf/ALL 2010/11/03 20:10:00 1.271
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1# $NetBSD: ALL,v 1.270 2010/10/24 09:27:45 jruoho Exp $ 1# $NetBSD: ALL,v 1.271 2010/11/03 20:10:00 christos 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.270 $" 20#ident "ALL-$Revision: 1.271 $"
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# Enhanced SpeedStep Technology in the Pentium M 32# Enhanced SpeedStep Technology in the Pentium M
33options ENHANCED_SPEEDSTEP 33options ENHANCED_SPEEDSTEP
@@ -1247,26 +1247,27 @@ ustir* at uhub? port ? @@ -1247,26 +1247,27 @@ ustir* at uhub? port ?
1247irframe* at ustir? 1247irframe* at ustir?
1248 1248
1249# USB Ethernet adapters 1249# USB Ethernet adapters
1250aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters 1250aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters
1251axe* at uhub? port ? # ASIX AX88172 based adapters 1251axe* at uhub? port ? # ASIX AX88172 based adapters
1252cdce* at uhub? port ? # CDC, Ethernet Networking Control Model 1252cdce* at uhub? port ? # CDC, Ethernet Networking Control Model
1253cue* at uhub? port ? # CATC USB-EL1201A based adapters 1253cue* at uhub? port ? # CATC USB-EL1201A based adapters
1254kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters 1254kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters
1255udav* at uhub? port ? # Davicom DM9601 based adapters 1255udav* at uhub? port ? # Davicom DM9601 based adapters
1256url* at uhub? port ? # Realtek RTL8150L based adapters 1256url* at uhub? port ? # Realtek RTL8150L based adapters
1257 1257
1258# USB 802.11 adapters 1258# USB 802.11 adapters
1259atu* at uhub? port ? # Atmel AT76C50XX based adapters 1259atu* at uhub? port ? # Atmel AT76C50XX based adapters
 1260otus* at uhub? port ? # Atheros AR9001U
1260ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g 1261ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
1261rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g 1262rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
1262upgt* at uhub? port ? # Intersil PrismGT 1263upgt* at uhub? port ? # Intersil PrismGT
1263zyd* at uhub? port ? # Zydas ZD1211 1264zyd* at uhub? port ? # Zydas ZD1211
1264 1265
1265# Prolific PL2301/PL2302 host-to-host adapter 1266# Prolific PL2301/PL2302 host-to-host adapter
1266upl* at uhub? port ? 1267upl* at uhub? port ?
1267 1268
1268# Serial adapters 1269# Serial adapters
1269ubsa* at uhub? port ? # Belkin serial adapter 1270ubsa* at uhub? port ? # Belkin serial adapter
1270ucom* at ubsa? portno ? 1271ucom* at ubsa? portno ?
1271 1272
1272uchcom* at uhub? port ? # WinChipHead CH341/CH340 serial adapter 1273uchcom* at uhub? port ? # WinChipHead CH341/CH340 serial adapter
cvs diff -r1.995 -r1.996 src/sys/arch/i386/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/i386/conf/GENERIC 2010/10/24 08:54:14 1.995
+++ src/sys/arch/i386/conf/GENERIC 2010/11/03 20:10:00 1.996
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: GENERIC,v 1.995 2010/10/24 08:54:14 jruoho Exp $ 1# $NetBSD: GENERIC,v 1.996 2010/11/03 20:10:00 christos 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.995 $" 25#ident "GENERIC-$Revision: 1.996 $"
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 modules by default. 29# For GENERIC, we build the exec formats as modules 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)
@@ -1197,26 +1197,27 @@ ustir* at uhub? port ? @@ -1197,26 +1197,27 @@ ustir* at uhub? port ?
1197irframe* at ustir? 1197irframe* at ustir?
1198 1198
1199# USB Ethernet adapters 1199# USB Ethernet adapters
1200aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters 1200aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters
1201axe* at uhub? port ? # ASIX AX88172 based adapters 1201axe* at uhub? port ? # ASIX AX88172 based adapters
1202cdce* at uhub? port ? # CDC, Ethernet Networking Control Model 1202cdce* at uhub? port ? # CDC, Ethernet Networking Control Model
1203cue* at uhub? port ? # CATC USB-EL1201A based adapters 1203cue* at uhub? port ? # CATC USB-EL1201A based adapters
1204kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters 1204kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters
1205udav* at uhub? port ? # Davicom DM9601 based adapters 1205udav* at uhub? port ? # Davicom DM9601 based adapters
1206url* at uhub? port ? # Realtek RTL8150L based adapters 1206url* at uhub? port ? # Realtek RTL8150L based adapters
1207 1207
1208# USB 802.11 adapters 1208# USB 802.11 adapters
1209atu* at uhub? port ? # Atmel AT76C50XX based adapters 1209atu* at uhub? port ? # Atmel AT76C50XX based adapters
 1210otus* at uhub? port ? # Atheros AR9001U
1210ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g 1211ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
1211rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g 1212rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
1212upgt* at uhub? port ? # Intersil PrismGT 1213upgt* at uhub? port ? # Intersil PrismGT
1213zyd* at uhub? port ? # Zydas ZD1211 1214zyd* at uhub? port ? # Zydas ZD1211
1214 1215
1215# Prolific PL2301/PL2302 host-to-host adapter 1216# Prolific PL2301/PL2302 host-to-host adapter
1216upl* at uhub? port ? 1217upl* at uhub? port ?
1217 1218
1218# Serial adapters 1219# Serial adapters
1219ubsa* at uhub? port ? # Belkin serial adapter 1220ubsa* at uhub? port ? # Belkin serial adapter
1220ucom* at ubsa? portno ? 1221ucom* at ubsa? portno ?
1221 1222
1222uchcom* at uhub? port ? # WinChipHead CH341/CH340 serial adapter 1223uchcom* at uhub? port ? # WinChipHead CH341/CH340 serial adapter