diff options
| -rw-r--r-- | sys/arch/alpha/conf/GENERIC | 21 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 24 | ||||
| -rw-r--r-- | sys/arch/armish/conf/GENERIC | 21 | ||||
| -rw-r--r-- | sys/arch/hppa/conf/GENERIC | 21 | ||||
| -rw-r--r-- | sys/arch/landisk/conf/GENERIC | 13 | ||||
| -rw-r--r-- | sys/arch/loongson/conf/GENERIC | 21 | ||||
| -rw-r--r-- | sys/arch/macppc/conf/GENERIC | 21 | ||||
| -rw-r--r-- | sys/arch/palm/conf/GENERIC | 26 | ||||
| -rw-r--r-- | sys/arch/sparc64/conf/GENERIC | 21 | ||||
| -rw-r--r-- | sys/arch/zaurus/conf/GENERIC | 25 |
10 files changed, 103 insertions, 111 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC index 7b929dd1334..3b5a7d3c9e7 100644 --- a/sys/arch/alpha/conf/GENERIC +++ b/sys/arch/alpha/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.223 2011/06/29 20:52:08 matthew Exp $ +# $OpenBSD: GENERIC,v 1.224 2011/07/07 23:41:09 tedu Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -129,16 +129,15 @@ uvideo* at uhub? video* at uvideo? # Bluetooth controllers -ubt* at uhub? disable # USB Bluetooth -bthub* at ubt? - -bthidev* at bthub? # Bluetooth HID support -btkbd* at bthidev? -btms* at bthidev? -wskbd* at btkbd? mux 1 -wsmouse* at btms? mux 0 -btsco* at bthub? # Bluetooth audio support -audio* at btsco? +#ubt* at uhub? disable # USB Bluetooth +#bthub* at ubt? +#bthidev* at bthub? # Bluetooth HID support +#btkbd* at bthidev? +#btms* at bthidev? +#wskbd* at btkbd? mux 1 +#wsmouse* at btms? mux 0 +#btsco* at bthub? # Bluetooth audio support +#audio* at btsco? # EV6 Tsunami Core Logic tsc* at mainbus0 diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index c2bfe2e8d2a..40f16b8bc31 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.323 2011/07/03 21:40:24 kettenis Exp $ +# $OpenBSD: GENERIC,v 1.324 2011/07/07 23:41:09 tedu Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -261,17 +261,17 @@ sdhc* at pci? # SD Host Controller sdmmc* at sdhc? # SD/MMC bus # Bluetooth controllers -sbt* at sdmmc? disable # SDIO Bluetooth -bthub* at sbt? -ubt* at uhub? disable # USB Bluetooth -bthub* at ubt? -bthidev* at bthub? # Bluetooth HID support -btkbd* at bthidev? -btms* at bthidev? -wskbd* at btkbd? mux 1 -wsmouse* at btms? mux 0 -btsco* at bthub? # Bluetooth audio support -audio* at btsco? +#sbt* at sdmmc? disable # SDIO Bluetooth +#bthub* at sbt? +#ubt* at uhub? disable # USB Bluetooth +#bthub* at ubt? +#bthidev* at bthub? # Bluetooth HID support +#btkbd* at bthidev? +#btms* at bthidev? +#wskbd* at btkbd? mux 1 +#wsmouse* at btms? mux 0 +#btsco* at bthub? # Bluetooth audio support +#audio* at btsco? isadma0 at isa? diff --git a/sys/arch/armish/conf/GENERIC b/sys/arch/armish/conf/GENERIC index 77da2129fbc..5d8a3753cfd 100644 --- a/sys/arch/armish/conf/GENERIC +++ b/sys/arch/armish/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.41 2011/06/29 20:52:08 matthew Exp $ +# $OpenBSD: GENERIC,v 1.42 2011/07/07 23:41:09 tedu Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -160,16 +160,15 @@ uow* at uhub? # Maxim/Dallas DS2490 1-Wire adapter onewire* at uow? # Bluetooth controllers -ubt* at uhub? disable # USB Bluetooth -bthub* at ubt? - -bthidev* at bthub? # Bluetooth HID support -btkbd* at bthidev? -btms* at bthidev? -wskbd* at btkbd? mux 1 -wsmouse* at btms? mux 0 -btsco* at bthub? # Bluetooth audio support -audio* at btsco? +#ubt* at uhub? disable # USB Bluetooth +#bthub* at ubt? +#bthidev* at bthub? # Bluetooth HID support +#btkbd* at bthidev? +#btms* at bthidev? +#wskbd* at btkbd? mux 1 +#wsmouse* at btms? mux 0 +#btsco* at bthub? # Bluetooth audio support +#audio* at btsco? amphy* at mii? # AMD 79C873 PHYs dcphy* at mii? # Digital Clone PHYs diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC index 8eb01fde08b..bbca786f7df 100644 --- a/sys/arch/hppa/conf/GENERIC +++ b/sys/arch/hppa/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.144 2011/06/29 20:52:09 matthew Exp $ +# $OpenBSD: GENERIC,v 1.145 2011/07/07 23:41:09 tedu Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -169,16 +169,15 @@ udl* at uhub? # DisplayLink USB displays wsdisplay* at udl? # Bluetooth controllers -ubt* at uhub? disable # USB Bluetooth -bthub* at ubt? - -bthidev* at bthub? # Bluetooth HID support -btkbd* at bthidev? -btms* at bthidev? -wskbd* at btkbd? mux 1 -wsmouse* at btms? mux 0 -btsco* at bthub? # Bluetooth audio support -audio* at btsco? +#ubt* at uhub? disable # USB Bluetooth +#bthub* at ubt? +#bthidev* at bthub? # Bluetooth HID support +#btkbd* at bthidev? +#btms* at bthidev? +#wskbd* at btkbd? mux 1 +#wsmouse* at btms? mux 0 +#btsco* at bthub? # Bluetooth audio support +#audio* at btsco? sti0 at mainbus0 irq 11 # [H]CRX-{8,24,48}[Z] graphics sti0 at phantomas0 irq 11 # builtin graphics on BC* diff --git a/sys/arch/landisk/conf/GENERIC b/sys/arch/landisk/conf/GENERIC index 9c5a77f3a1c..30d7859a039 100644 --- a/sys/arch/landisk/conf/GENERIC +++ b/sys/arch/landisk/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.35 2011/06/29 20:52:09 matthew Exp $ +# $OpenBSD: GENERIC,v 1.36 2011/07/07 23:41:09 tedu Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -163,16 +163,15 @@ udl* at uhub? wsdisplay* at udl? # Bluetooth controllers -ubt* at uhub? disable # USB Bluetooth -bthub* at ubt? - -bthidev* at bthub? # Bluetooth HID support +#ubt* at uhub? disable # USB Bluetooth +#bthub* at ubt? +#bthidev* at bthub? # Bluetooth HID support #btkbd* at bthidev? #btms* at bthidev? #wskbd* at btkbd? mux 1 #wsmouse* at btms? mux 0 -btsco* at bthub? # Bluetooth audio support -audio* at btsco? +#btsco* at bthub? # Bluetooth audio support +#audio* at btsco? scsibus* at scsi? sd* at scsibus? # SCSI disk drives diff --git a/sys/arch/loongson/conf/GENERIC b/sys/arch/loongson/conf/GENERIC index a84ee62d874..10936e1afc1 100644 --- a/sys/arch/loongson/conf/GENERIC +++ b/sys/arch/loongson/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.35 2011/06/29 20:52:09 matthew Exp $ +# $OpenBSD: GENERIC,v 1.36 2011/07/07 23:41:09 tedu Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -173,16 +173,15 @@ udl* at uhub? wsdisplay* at udl? # Bluetooth controllers -ubt* at uhub? disable # USB Bluetooth -bthub* at ubt? - -bthidev* at bthub? # Bluetooth HID support -btkbd* at bthidev? -btms* at bthidev? -wskbd* at btkbd? mux 1 -wsmouse* at btms? mux 0 -btsco* at bthub? # Bluetooth audio support -audio* at btsco? +#ubt* at uhub? disable # USB Bluetooth +#bthub* at ubt? +#bthidev* at bthub? # Bluetooth HID support +#btkbd* at bthidev? +#btms* at bthidev? +#wskbd* at btkbd? mux 1 +#wsmouse* at btms? mux 0 +#btsco* at bthub? # Bluetooth audio support +#audio* at btsco? # NICs ral* at pci? diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC index d56f386bbb0..14b944b8a8e 100644 --- a/sys/arch/macppc/conf/GENERIC +++ b/sys/arch/macppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.211 2011/06/29 20:52:09 matthew Exp $g +# $OpenBSD: GENERIC,v 1.212 2011/07/07 23:41:09 tedu Exp $g # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -302,16 +302,15 @@ udl* at uhub? wsdisplay* at udl? # Bluetooth controllers -ubt* at uhub? disable # USB Bluetooth -bthub* at ubt? - -bthidev* at bthub? # Bluetooth HID support -btkbd* at bthidev? -btms* at bthidev? -wskbd* at btkbd? mux 1 -wsmouse* at btms? mux 0 -btsco* at bthub? # Bluetooth audio support -audio* at btsco? +#ubt* at uhub? disable # USB Bluetooth +#bthub* at ubt? +#bthidev* at bthub? # Bluetooth HID support +#btkbd* at bthidev? +#btms* at bthidev? +#wskbd* at btkbd? mux 1 +#wsmouse* at btms? mux 0 +#btsco* at bthub? # Bluetooth audio support +#audio* at btsco? # I2C bus support iic* at kiic? diff --git a/sys/arch/palm/conf/GENERIC b/sys/arch/palm/conf/GENERIC index 923818915ec..73892e1102c 100644 --- a/sys/arch/palm/conf/GENERIC +++ b/sys/arch/palm/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.12 2011/06/29 20:52:09 matthew Exp $ +# $OpenBSD: GENERIC,v 1.13 2011/07/07 23:41:09 tedu Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -193,23 +193,23 @@ pxammc0 at pxaip? addr 0x41100000 # MMC/SD/SDIO controller sdmmc* at pxammc? # SD/MMC bus # Bluetooth controllers -sbt* at sdmmc? disable # SDIO Bluetooth -bthub* at sbt? -ubt* at uhub? disable # USB Bluetooth -bthub* at ubt? +#sbt* at sdmmc? disable # SDIO Bluetooth +#bthub* at sbt? +#ubt* at uhub? disable # USB Bluetooth +#bthub* at ubt? +#bthidev* at bthub? # Bluetooth HID support +#btkbd* at bthidev? +#btms* at bthidev? +#wskbd* at btkbd? mux 1 +#wsmouse* at btms? mux 0 +#btsco* at bthub? # Bluetooth audio support +#audio* at btsco? + # USB Video uvideo* at uhub? video* at uvideo? -bthidev* at bthub? # Bluetooth HID support -btkbd* at bthidev? -btms* at bthidev? -wskbd* at btkbd? mux 1 -wsmouse* at btms? mux 0 -btsco* at bthub? # Bluetooth audio support -audio* at btsco? - # 1-Wire devices option ONEWIREVERBOSE owid* at onewire? # ID diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC index a8f68f0ee79..08f7f9aa66d 100644 --- a/sys/arch/sparc64/conf/GENERIC +++ b/sys/arch/sparc64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.266 2011/06/29 20:52:09 matthew Exp $ +# $OpenBSD: GENERIC,v 1.267 2011/07/07 23:41:09 tedu Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -244,16 +244,15 @@ uvideo* at uhub? video* at uvideo? # Bluetooth controllers -ubt* at uhub? disable # USB Bluetooth -bthub* at ubt? - -bthidev* at bthub? # Bluetooth HID support -btkbd* at bthidev? -btms* at bthidev? -wskbd* at btkbd? mux 1 -wsmouse* at btms? mux 0 -btsco* at bthub? # Bluetooth audio support -audio* at btsco? +#ubt* at uhub? disable # USB Bluetooth +#bthub* at ubt? +#bthidev* at bthub? # Bluetooth HID support +#btkbd* at bthidev? +#btms* at bthidev? +#wskbd* at btkbd? mux 1 +#wsmouse* at btms? mux 0 +#btsco* at bthub? # Bluetooth audio support +#audio* at btsco? # CardBus bus support cardbus* at cardslot? diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC index 827986d1651..e36ca3f9148 100644 --- a/sys/arch/zaurus/conf/GENERIC +++ b/sys/arch/zaurus/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.84 2011/06/29 20:52:09 matthew Exp $ +# $OpenBSD: GENERIC,v 1.85 2011/07/07 23:41:09 tedu Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -208,23 +208,22 @@ pxammc0 at pxaip? # MMC/SD/SDIO controller sdmmc* at pxammc? # SD/MMC bus # Bluetooth controllers -sbt* at sdmmc? disable # SDIO Bluetooth -bthub* at sbt? -ubt* at uhub? disable # USB Bluetooth -bthub* at ubt? +#sbt* at sdmmc? disable # SDIO Bluetooth +#bthub* at sbt? +#ubt* at uhub? disable # USB Bluetooth +#bthub* at ubt? +#bthidev* at bthub? # Bluetooth HID support +#btkbd* at bthidev? +#btms* at bthidev? +#wskbd* at btkbd? mux 1 +#wsmouse* at btms? mux 0 +#btsco* at bthub? # Bluetooth audio support +#audio* at btsco? # USB Video uvideo* at uhub? video* at uvideo? -bthidev* at bthub? # Bluetooth HID support -btkbd* at bthidev? -btms* at bthidev? -wskbd* at btkbd? mux 1 -wsmouse* at btms? mux 0 -btsco* at bthub? # Bluetooth audio support -audio* at btsco? - # 1-Wire devices option ONEWIREVERBOSE owid* at onewire? # ID |