diff options
| author | emax <emax@FreeBSD.org> | 2004-04-27 16:38:15 +0000 |
|---|---|---|
| committer | emax <emax@FreeBSD.org> | 2004-04-27 16:38:15 +0000 |
| commit | 8a65e07a873529e28a39dde6df79059f4befd96d (patch) | |
| tree | 55d9b893bcd8160df8d483da8e7c72ff49e57811 /sys/conf | |
| parent | 927d6867f047e5ca2a26e76d448e4f6b998f43ea (diff) | |
| download | FreeBSD-src-8a65e07a873529e28a39dde6df79059f4befd96d.zip FreeBSD-src-8a65e07a873529e28a39dde6df79059f4befd96d.tar.gz | |
Address few style issues pointed out by bde
Reviewed by: bde, ru
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/NOTES | 20 | ||||
| -rw-r--r-- | sys/conf/kern.pre.mk | 9 | ||||
| -rw-r--r-- | sys/conf/options | 20 |
3 files changed, 18 insertions, 31 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index d69cd31..1d99f5d 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -410,6 +410,15 @@ options LIBMCHAIN options NETGRAPH #netgraph(4) system options NETGRAPH_ASYNC options NETGRAPH_ATMLLC +options NETGRAPH_ATM_ATMPIF +options NETGRAPH_BLUETOOTH # ng_bluetooth(4) +options NETGRAPH_BLUETOOTH_BT3C # ng_bt3c(4) +options NETGRAPH_BLUETOOTH_H4 # ng_h4(4) +options NETGRAPH_BLUETOOTH_HCI # ng_hci(4) +options NETGRAPH_BLUETOOTH_L2CAP # ng_l2cap(4) +options NETGRAPH_BLUETOOTH_SOCKET # ng_btsocket(4) +options NETGRAPH_BLUETOOTH_UBT # ng_ubt(4) +options NETGRAPH_BLUETOOTH_UBTBCMFW # ubtbcmfw(4) options NETGRAPH_BPF options NETGRAPH_BRIDGE options NETGRAPH_CISCO @@ -439,17 +448,6 @@ options NETGRAPH_TEE options NETGRAPH_TTY options NETGRAPH_UI options NETGRAPH_VJC -options NETGRAPH_ATM_ATMPIF - -# NgBluetooth - Netgraph Bluetooth -options NETGRAPH_BLUETOOTH # Common parts -options NETGRAPH_BLUETOOTH_BT3C # 3COM Bluetooth PCCARD -options NETGRAPH_BLUETOOTH_H4 # H4 line discipline -options NETGRAPH_BLUETOOTH_UBT # Bluetooth USB dongle -options NETGRAPH_BLUETOOTH_UBTBCMFW # Firmware driver for BCM2033 -options NETGRAPH_BLUETOOTH_HCI # Bluetooth HCI layer -options NETGRAPH_BLUETOOTH_L2CAP # Bluetooth L2CAP layer -options NETGRAPH_BLUETOOTH_SOCKET # Bluetooth sockets layer # NgATM - Netgraph ATM options NGATM_ATM diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index fddeca1..83afd1e 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -63,15 +63,6 @@ INCLUDES+= -I$S/contrib/dev/ath -I$S/contrib/dev/ath/freebsd # ... and the same for the NgATM stuff INCLUDES+= -I$S/contrib/ngatm -# ... and the same for the NgBluetooth stuff -INCLUDES+= -I$S/netgraph/bluetooth/include -INCLUDES+= -I$S/netgraph/bluetooth/drivers/bt3c -INCLUDES+= -I$S/netgraph/bluetooth/drivers/h4 -INCLUDES+= -I$S/netgraph/bluetooth/drivers/ubt -INCLUDES+= -I$S/netgraph/bluetooth/drivers/ubtbcmfw -INCLUDES+= -I$S/netgraph/bluetooth/hci -INCLUDES+= -I$S/netgraph/bluetooth/l2cap - COPTS= ${INCLUDES} -D_KERNEL -include opt_global.h CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} .if ${CC} != "icc" diff --git a/sys/conf/options b/sys/conf/options index 0c157dc..2191fe7 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -351,6 +351,15 @@ XBONEHACK NETGRAPH NETGRAPH_ASYNC opt_netgraph.h NETGRAPH_ATMLLC opt_netgraph.h +NETGRAPH_ATM_ATMPIF opt_netgraph.h +NETGRAPH_BLUETOOTH opt_netgraph.h +NETGRAPH_BLUETOOTH_BT3C opt_netgraph.h +NETGRAPH_BLUETOOTH_H4 opt_netgraph.h +NETGRAPH_BLUETOOTH_HCI opt_netgraph.h +NETGRAPH_BLUETOOTH_L2CAP opt_netgraph.h +NETGRAPH_BLUETOOTH_SOCKET opt_netgraph.h +NETGRAPH_BLUETOOTH_UBT opt_netgraph.h +NETGRAPH_BLUETOOTH_UBTBCMFW opt_netgraph.h NETGRAPH_BPF opt_netgraph.h NETGRAPH_BRIDGE opt_netgraph.h NETGRAPH_CISCO opt_netgraph.h @@ -380,17 +389,6 @@ NETGRAPH_TEE opt_netgraph.h NETGRAPH_TTY opt_netgraph.h NETGRAPH_UI opt_netgraph.h NETGRAPH_VJC opt_netgraph.h -NETGRAPH_ATM_ATMPIF opt_netgraph.h - -# NgBluetooth options -NETGRAPH_BLUETOOTH opt_netgraph.h -NETGRAPH_BLUETOOTH_BT3C opt_netgraph.h -NETGRAPH_BLUETOOTH_H4 opt_netgraph.h -NETGRAPH_BLUETOOTH_UBT opt_netgraph.h -NETGRAPH_BLUETOOTH_UBTBCMFW opt_netgraph.h -NETGRAPH_BLUETOOTH_HCI opt_netgraph.h -NETGRAPH_BLUETOOTH_L2CAP opt_netgraph.h -NETGRAPH_BLUETOOTH_SOCKET opt_netgraph.h # NgATM options NGATM_ATM opt_netgraph.h |
