Module Name: src
Committed By: kiyohara
Date: Sat Oct 16 05:49:03 UTC 2010
Modified Files:
src/sys/arch/bebox/conf: GENERIC majors.bebox
Log Message:
Add bktr(4). (BeOS seems to have supported BT848. ;)
Remove INSECURE.
Disable options PMS_SYNAPTICS_TOUCHPAD.
Remove mms and lms from majors.bebox.
To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 src/sys/arch/bebox/conf/GENERIC
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/bebox/conf/majors.bebox
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/bebox/conf/GENERIC
diff -u src/sys/arch/bebox/conf/GENERIC:1.120 src/sys/arch/bebox/conf/GENERIC:1.121
--- src/sys/arch/bebox/conf/GENERIC:1.120 Sun Aug 1 06:13:19 2010
+++ src/sys/arch/bebox/conf/GENERIC Sat Oct 16 05:49:03 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.120 2010/08/01 06:13:19 kiyohara Exp $
+# $NetBSD: GENERIC,v 1.121 2010/10/16 05:49:03 kiyohara Exp $
#
# GENERIC machine description file
#
@@ -22,14 +22,12 @@
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.120 $"
+#ident "GENERIC-$Revision: 1.121 $"
maxusers 32
# Standard system options
-options INSECURE # disable kernel security levels - X needs this
-
options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
options NTP # NTP phase/frequency locked loop
@@ -187,7 +185,7 @@
pckbd* at pckbc? # PC keyboard
pms* at pckbc? # PS/2 mouse for wsmouse
#options PMS_DISABLE_POWERHOOK # Disable PS/2 reset on resume
-options PMS_SYNAPTICS_TOUCHPAD # Enable support for Synaptics Touchpads
+#options PMS_SYNAPTICS_TOUCHPAD # Enable support for Synaptics Touchpads
genfb* at pci? dev ? function ?
options WSFB_FAKE_VGA_FB
vga* at pci? dev ? function ?
@@ -262,6 +260,11 @@
# MII/PHY support
ukphy* at mii? phy ? # generic unknown PHYs
+# TV cards
+
+# Brooktree 848/849/878/879 based TV cards
+bktr* at pci? dev ? function ? # Brooktree video/audio capture/tuner
+
# Pseudo-Devices
Index: src/sys/arch/bebox/conf/majors.bebox
diff -u src/sys/arch/bebox/conf/majors.bebox:1.22 src/sys/arch/bebox/conf/majors.bebox:1.23
--- src/sys/arch/bebox/conf/majors.bebox:1.22 Sun Aug 1 06:13:19 2010
+++ src/sys/arch/bebox/conf/majors.bebox Sat Oct 16 05:49:03 2010
@@ -1,4 +1,4 @@
-# $NetBSD: majors.bebox,v 1.22 2010/08/01 06:13:19 kiyohara Exp $
+# $NetBSD: majors.bebox,v 1.23 2010/10/16 05:49:03 kiyohara Exp $
#
# Device majors for bebox
#
@@ -32,9 +32,6 @@
device-major joy char 26 joy
device-major spkr char 27 spkr
-device-major mms char 35 mms
-device-major lms char 36 lms
-
device-major cy char 38 cy
device-major mcd char 39 block 7 mcd
device-major tun char 40 tun
@@ -60,6 +57,7 @@
device-major ksyms char 61 ksyms
device-major wsfont char 62 wsfont
device-major pci char 63 pci
+device-major bktr char 71 bktr
device-major nsmb char 98 nsmb
