summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2014-07-11 21:58:33 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2014-07-11 21:58:33 +0000
commitccb07c12e4f3be9ef13ff4e49dd67254181645e6 (patch)
tree37f9e86cdce665e347a7d082c727997a549d6f77
parentd537622e1f6ad37ad18d7ec82d0bc9ab1ee59bdf (diff)
remove bluetooth bits
-rw-r--r--etc/MAKEDEV.common4
-rw-r--r--etc/rc.conf4
2 files changed, 2 insertions, 6 deletions
diff --git a/etc/MAKEDEV.common b/etc/MAKEDEV.common
index c3fdebff795..6e1ed784cc8 100644
--- a/etc/MAKEDEV.common
+++ b/etc/MAKEDEV.common
@@ -1,4 +1,4 @@
-vers(a, {-$OpenBSD: MAKEDEV.common,v 1.73 2013/11/21 11:04:44 kettenis Exp $-})dnl
+vers(a, {-$OpenBSD: MAKEDEV.common,v 1.74 2014/07/11 21:58:32 tedu Exp $-})dnl
dnl
dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
dnl
@@ -204,8 +204,6 @@ __devtitle(dis, Disks)dnl
__devitem(sd, {-sd*-}, {-SCSI disks{-,-} including flopticals-})dnl
__devitem(cd, {-cd*-}, ATAPI and SCSI CD-ROM drives)dnl
_mkdev(cd, cd*, {-dodisk2 cd $U major_cd_b major_cd_c $U 0{--}ifstep(cd)-})dnl
-__devitem(bthub, {-bthub*-}, Bluetooth Hubs,nothing)dnl
-_mcdev(bthub, bthub*, bthub, {-major_bthub_c-})dnl
__devitem(fuse, fuse, Userland Filesystem, fuse 4)dnl
_mcdev(fuse, fuse, fuse, {-major_fuse_c-}, 600)dnl
__devitem(ch, {-ch*-}, SCSI media changers)dnl
diff --git a/etc/rc.conf b/etc/rc.conf
index 861b0084d53..7bd994d5ac3 100644
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: rc.conf,v 1.190 2014/06/09 18:31:58 jasper Exp $
+# $OpenBSD: rc.conf,v 1.191 2014/07/11 21:58:32 tedu Exp $
# DO NOT EDIT THIS FILE!!
#
@@ -90,7 +90,6 @@ wsmoused_flags=NO # for ps/2 or usb mice: "", serial: "-p /dev/cua00"
# set the following to "YES" to turn them on
pf=YES # Packet filter / NAT
ipsec=NO # IPsec
-bt=NO # Bluetooth
check_quotas=YES # NO may be desirable in some YP environments
accounting=NO # process accounting (using /var/account/acct)
@@ -113,7 +112,6 @@ amd_master=/etc/amd/master # AMD 'master' map
syslogd_flags= # add more flags, e.g. "-u -a /chroot/dev/log"
pf_rules=/etc/pf.conf # Packet filter rules file
ipsec_rules=/etc/ipsec.conf # IPsec rules file
-bt_rules=/etc/bt.conf # Bluetooth rules file
pflogd_flags= # add more flags, e.g. "-s 256"
shlib_dirs= # extra directories for ldconfig, separated
# by space