diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/alpha/conf/GENERIC | 9 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 11 | ||||
| -rw-r--r-- | sys/arch/armish/conf/GENERIC | 9 | ||||
| -rw-r--r-- | sys/arch/cats/conf/GENERIC | 9 | ||||
| -rw-r--r-- | sys/arch/hppa/conf/GENERIC | 9 | ||||
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 12 | ||||
| -rw-r--r-- | sys/arch/landisk/conf/GENERIC | 9 | ||||
| -rw-r--r-- | sys/arch/macppc/conf/GENERIC | 9 | ||||
| -rw-r--r-- | sys/arch/sparc64/conf/GENERIC | 9 | ||||
| -rw-r--r-- | sys/arch/zaurus/conf/GENERIC | 11 |
10 files changed, 75 insertions, 22 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC index cedd196d635..bd6f66a428e 100644 --- a/sys/arch/alpha/conf/GENERIC +++ b/sys/arch/alpha/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.192 2007/05/28 23:10:10 beck Exp $ +# $OpenBSD: GENERIC,v 1.193 2007/05/31 23:18:25 uwe Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -117,7 +117,6 @@ scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio -#ubt* at uhub? # USB Bluetooth ugen* at uhub? # USB Generic driver uath* at uhub? # Atheros AR5005UG/AR5005UX ural* at uhub? # Ralink RT2500USB @@ -125,6 +124,12 @@ rum* at uhub? # Ralink RT2501USB/RT2601USB uow* at uhub? # Maxim/Dallas DS2490 1-Wire adapter onewire* at uow? +# Bluetooth controllers +#ubt* at uhub? # USB Bluetooth + +# Bluetooth bus support +#bthub* at ubt? + # EV6 Tsunami Core Logic tsc* at mainbus0 diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index 61d74f3be76..ba40672ae35 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.186 2007/05/28 22:26:03 todd Exp $ +# $OpenBSD: GENERIC,v 1.187 2007/05/31 23:18:25 uwe Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -192,7 +192,6 @@ scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio -#ubt* at uhub? # USB Bluetooth uberry* at uhub? # Research In Motion Blackberry ugen* at uhub? # USB Generic driver uath* at uhub? # Atheros AR5005UG/AR5005UX @@ -210,6 +209,14 @@ sdhc* at pci? # SD Host Controller sdmmc* at sdhc? # SD/MMC bus scsibus* at sdmmc? # SCSI emulation +# Bluetooth controllers +#sbt* at sdmmc? # SDIO Bluetooth +#ubt* at uhub? # USB Bluetooth + +# Bluetooth bus support +#bthub* at sbt? +#bthub* at ubt? + isadma0 at isa? option WSDISPLAY_COMPAT_USL # VT handling diff --git a/sys/arch/armish/conf/GENERIC b/sys/arch/armish/conf/GENERIC index 7f3323c4326..c50906e9151 100644 --- a/sys/arch/armish/conf/GENERIC +++ b/sys/arch/armish/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.15 2007/05/26 22:16:22 todd Exp $ +# $OpenBSD: GENERIC,v 1.16 2007/05/31 23:18:25 uwe Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -139,7 +139,6 @@ scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio -#ubt* at uhub? # USB Bluetooth ugen* at uhub? # USB Generic driver ural* at uhub? # Ralink RT2500USB rum* at uhub? # Ralink RT2501USB/RT2601USB @@ -147,6 +146,12 @@ rum* at uhub? # Ralink RT2501USB/RT2601USB uow* at uhub? # Maxim/Dallas DS2490 1-Wire adapter onewire* at uow? +# Bluetooth controllers +#ubt* at uhub? # USB Bluetooth + +# Bluetooth bus support +#bthub* at ubt? + amphy* at mii? # AMD 79C873 PHYs dcphy* at mii? # Digital Clone PHYs exphy* at mii? # 3Com internal PHYs diff --git a/sys/arch/cats/conf/GENERIC b/sys/arch/cats/conf/GENERIC index 9a5b376ea3b..c3bae9aa054 100644 --- a/sys/arch/cats/conf/GENERIC +++ b/sys/arch/cats/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.36 2007/02/28 21:54:43 grange Exp $ +# $OpenBSD: GENERIC,v 1.37 2007/05/31 23:18:25 uwe Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -215,11 +215,16 @@ scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio -#ubt* at uhub? # USB Bluetooth ugen* at uhub? # USB Generic driver uow* at uhub? # Maxim/Dallas DS2490 1-Wire adapter onewire* at uow? +# Bluetooth controllers +#ubt* at uhub? # USB Bluetooth + +# Bluetooth bus support +#bthub* at ubt? + # Audio Devices # PCI audio devices diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC index f86096a185f..989a8982c66 100644 --- a/sys/arch/hppa/conf/GENERIC +++ b/sys/arch/hppa/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.98 2007/05/23 18:24:25 kettenis Exp $ +# $OpenBSD: GENERIC,v 1.99 2007/05/31 23:18:25 uwe Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -157,13 +157,18 @@ scsibus* at usscanner? uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio -#ubt* at uhub? # USB Bluetooth ugen* at uhub? # USB Generic driver ural* at uhub? # Ralink RT2500USB rum* at uhub? # Ralink RT2501USB/RT2601USB uow* at uhub? # Maxim/Dallas DS2490 1-Wire adapter onewire* at uow? +# Bluetooth controllers +#ubt* at uhub? # USB Bluetooth + +# Bluetooth bus support +#bthub* at ubt? + sti0 at mainbus0 irq 11 # [H]CRX-{8,24,48}[Z] graphics sti0 at phantomas0 irq 11 # builtin graphics on BC* sti1 at mainbus0 irq 12 diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index c46ac60f2eb..478c8b76e7b 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.564 2007/05/31 18:45:08 uwe Exp $ +# $OpenBSD: GENERIC,v 1.565 2007/05/31 23:18:25 uwe Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -246,7 +246,6 @@ scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio -#ubt* at uhub? # USB Bluetooth uberry* at uhub? # Research In Motion Blackberry ugen* at uhub? # USB Generic driver uath* at uhub? # Atheros AR5005UG/AR5005UX @@ -265,8 +264,13 @@ sdhc* at pci? # SD Host Controller sdmmc* at sdhc? # SD/MMC bus scsibus* at sdmmc? # SCSI emulation -# SDIO devices -#sbt* at sdmmc? # Bluetooth +# Bluetooth controllers +#sbt* at sdmmc? # SDIO Bluetooth +#ubt* at uhub? # USB Bluetooth + +# Bluetooth bus support +#bthub* at sbt? +#bthub* at ubt? npx0 at isa? port 0xf0 irq 13 # math coprocessor isadma0 at isa? diff --git a/sys/arch/landisk/conf/GENERIC b/sys/arch/landisk/conf/GENERIC index fcb32663a9b..d6b4d7c0d91 100644 --- a/sys/arch/landisk/conf/GENERIC +++ b/sys/arch/landisk/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.12 2007/03/19 20:14:14 miod Exp $ +# $OpenBSD: GENERIC,v 1.13 2007/05/31 23:18:25 uwe Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -144,7 +144,6 @@ urio* at uhub? # Diamond Multimedia Rio 500 #uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio -#ubt* at uhub? # USB Bluetooth ugen* at uhub? # USB Generic driver uath* at uhub? # Atheros AR5005UG/AR5005UX ural* at uhub? # Ralink RT2500USB @@ -156,5 +155,11 @@ udcf* at uhub? # Gude Expert mouseCLOCK #uow* at uhub? # Maxim/Dallas DS2490 1-Wire adapter #onewire* at uow? +# Bluetooth controllers +#ubt* at uhub? # USB Bluetooth + +# Bluetooth bus support +#bthub* at ubt? + sd* at scsibus? # SCSI disk drives cd* at scsibus? # SCSI CD-ROM drives diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC index 3ca4c473537..a2dd3954428 100644 --- a/sys/arch/macppc/conf/GENERIC +++ b/sys/arch/macppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.168 2007/05/28 13:13:54 martin Exp $g +# $OpenBSD: GENERIC,v 1.169 2007/05/31 23:18:25 uwe Exp $g # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -274,7 +274,6 @@ scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio -#ubt* at uhub? # USB Bluetooth ugen* at uhub? # USB Generic driver ural* at uhub? # Ralink RT2500USB rum* at uhub? # Ralink RT2501USB/RT2601USB @@ -282,6 +281,12 @@ udcf* at uhub? # Gude Expert mouseCLOCK uow* at uhub? # Maxim/Dallas DS2490 1-Wire adapter onewire* at uow? +# Bluetooth controllers +#ubt* at uhub? # USB Bluetooth + +# Bluetooth bus support +#bthub* at ubt? + # I2C bus support iic* at kiic? iic* at piic? diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC index 8d72b2199ee..f668366d97d 100644 --- a/sys/arch/sparc64/conf/GENERIC +++ b/sys/arch/sparc64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.179 2007/05/29 04:10:15 kettenis Exp $ +# $OpenBSD: GENERIC,v 1.180 2007/05/31 23:18:25 uwe Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -194,12 +194,17 @@ scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio -#ubt* at uhub? # USB Bluetooth ugen* at uhub? # USB Generic driver udcf* at uhub? # Gude Expert mouseCLOCK uow* at uhub? # Maxim/Dallas DS2490 1-Wire adapter onewire* at uow? +# Bluetooth controllers +#ubt* at uhub? # USB Bluetooth + +# Bluetooth bus support +#bthub* at ubt? + #### Standard system devices -- all required for a given architecture auxio* at ebus? diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC index 891edae7496..0ba528a10e9 100644 --- a/sys/arch/zaurus/conf/GENERIC +++ b/sys/arch/zaurus/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.63 2007/05/04 03:44:44 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.64 2007/05/31 23:18:25 uwe Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -129,7 +129,6 @@ scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio -#ubt* at uhub? # USB Bluetooth ugen* at uhub? # USB Generic driver udcf* at uhub? # Gude Expert mouseCLOCK uow* at uhub? # Maxim/Dallas DS2490 1-Wire adapter @@ -206,6 +205,14 @@ pxammc0 at pxaip? # MMC/SD/SDIO controller sdmmc* at pxammc? # SD/MMC bus scsibus* at sdmmc? # SCSI emulation +# Bluetooth controllers +#sbt* at sdmmc? # SDIO Bluetooth +#ubt* at uhub? # USB Bluetooth + +# Bluetooth bus support +#bthub* at sbt? +#bthub* at ubt? + # 1-Wire devices option ONEWIREVERBOSE owid* at onewire? # ID |