Commit b8ba2a4d authored by Maksim Krasnyanskiy's avatar Maksim Krasnyanskiy

Fix files that escaped CONFIG_BLUEZ_XXX -> CONFIG_BT_XXX cleanup.

Mostly arch specific default configs.
parent 9beb225e
......@@ -808,7 +808,7 @@ CONFIG_SOUND_GAMEPORT=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -664,7 +664,7 @@ CONFIG_PARTITION_ADVANCED=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -649,7 +649,7 @@ CONFIG_USB_MOUSE=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -605,7 +605,7 @@ CONFIG_FONT_8x16=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -949,7 +949,7 @@ CONFIG_SWITCHES_UCB1X00=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -1128,15 +1128,15 @@ CONFIG_USB_RIO500=m
#
# Bluetooth support
#
CONFIG_BLUEZ=m
CONFIG_BLUEZ_L2CAP=m
CONFIG_BT=m
CONFIG_BT_L2CAP=m
#
# Bluetooth device drivers
#
CONFIG_BLUEZ_HCIUSB=m
CONFIG_BLUEZ_HCIUART=m
CONFIG_BLUEZ_HCIVHCI=m
CONFIG_BT_HCIUSB=m
CONFIG_BT_HCIUART=m
CONFIG_BT_HCIVHCI=m
#
# Kernel hacking
......
......@@ -858,7 +858,7 @@ CONFIG_PC_KEYMAP=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -944,15 +944,15 @@ CONFIG_SOUND_CERF_UDA1341=y
#
# Bluetooth support
#
CONFIG_BLUEZ=y
CONFIG_BLUEZ_L2CAP=y
CONFIG_BT=y
CONFIG_BT_L2CAP=y
#
# Bluetooth device drivers
#
# CONFIG_BLUEZ_HCIUSB is not set
CONFIG_BLUEZ_HCIUART=y
# CONFIG_BLUEZ_HCIVHCI is not set
# CONFIG_BT_HCIUSB is not set
CONFIG_BT_HCIUART=y
# CONFIG_BT_HCIVHCI is not set
#
# Kernel hacking
......
......@@ -879,7 +879,7 @@ CONFIG_FONT_8x16=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -673,7 +673,7 @@ CONFIG_MSDOS_PARTITION=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -881,7 +881,7 @@ CONFIG_SOUND=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -572,7 +572,7 @@ CONFIG_MSDOS_PARTITION=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -717,7 +717,7 @@ CONFIG_FONT_8x16=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -730,7 +730,7 @@ CONFIG_USB_MOUSE=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -934,7 +934,7 @@ CONFIG_SOUND_H3600_UDA1341=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -781,7 +781,7 @@ CONFIG_MSDOS_PARTITION=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -876,7 +876,7 @@ CONFIG_SOUND_SA1100=m
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -878,7 +878,7 @@ CONFIG_SOUND_SA1100SSP=m
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -855,7 +855,7 @@ CONFIG_SOUND_PRIME=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -1099,7 +1099,7 @@ CONFIG_USB_OHCI_SA1111=m
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -727,7 +727,7 @@ CONFIG_SOUND_PANGOLIN_UDA1341=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -520,7 +520,7 @@ CONFIG_MSDOS_PARTITION=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -721,7 +721,7 @@ CONFIG_MCP_UCB1200_TS=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -912,7 +912,7 @@ CONFIG_SOUND_SB=m
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -941,7 +941,7 @@ CONFIG_SOUND_H3600_UDA1341=m
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -947,7 +947,7 @@ CONFIG_USB_USBNET=m
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -1138,7 +1138,7 @@ CONFIG_USB_STORAGE=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -919,7 +919,7 @@ CONFIG_USB_MOUSE=m
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -741,7 +741,7 @@ CONFIG_VGA_CONSOLE=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -741,7 +741,7 @@ CONFIG_VGA_CONSOLE=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -702,7 +702,7 @@ CONFIG_NLS_DEFAULT="n"
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -704,7 +704,7 @@ CONFIG_NLS_DEFAULT="n"
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -702,7 +702,7 @@ CONFIG_NLS_DEFAULT="n"
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -702,7 +702,7 @@ CONFIG_NLS_DEFAULT="n"
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -701,7 +701,7 @@ CONFIG_NLS_DEFAULT="n"
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -703,7 +703,7 @@ CONFIG_NLS_DEFAULT="n"
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -701,7 +701,7 @@ CONFIG_NLS_DEFAULT="n"
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -466,7 +466,7 @@ CONFIG_8xx_COPYBACK=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -587,7 +587,7 @@ CONFIG_8xx_COPYBACK=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -559,7 +559,7 @@ CONFIG_8xx_CPU6=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -558,7 +558,7 @@ CONFIG_8xx_COPYBACK=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -559,7 +559,7 @@ CONFIG_8xx_COPYBACK=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -559,7 +559,7 @@ CONFIG_8xx_CPU6=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -618,7 +618,7 @@ CONFIG_8xx_COPYBACK=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -637,7 +637,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -925,7 +925,7 @@ CONFIG_SOUND_VMIDI=m
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -558,7 +558,7 @@ CONFIG_MSDOS_PARTITION=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -558,7 +558,7 @@ CONFIG_8xx_COPYBACK=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -600,7 +600,7 @@ CONFIG_MSDOS_PARTITION=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -972,7 +972,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -624,7 +624,7 @@ CONFIG_MSDOS_PARTITION=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -594,7 +594,7 @@ CONFIG_MSDOS_PARTITION=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -529,7 +529,7 @@ CONFIG_SCC1_ENET=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -596,7 +596,7 @@ CONFIG_MSDOS_PARTITION=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -626,7 +626,7 @@ CONFIG_SOLARIS_X86_PARTITION=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -466,7 +466,7 @@ CONFIG_NLS_ISO8859_1=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -808,7 +808,7 @@ CONFIG_NLS_ISO8859_1=m
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -614,7 +614,7 @@ CONFIG_MSDOS_PARTITION=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -873,7 +873,7 @@ CONFIG_USB_SERIAL_VISOR=m
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Library routines
......
......@@ -551,7 +551,7 @@ CONFIG_8xx_CPU6=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -464,7 +464,7 @@ CONFIG_MSDOS_PARTITION=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -660,7 +660,7 @@ CONFIG_MSDOS_PARTITION=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -573,7 +573,7 @@ CONFIG_MSDOS_PARTITION=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -1052,7 +1052,7 @@ CONFIG_USB_SERIAL_VISOR=m
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -830,7 +830,7 @@ CONFIG_SOUND_TVMIXER=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -756,7 +756,7 @@ CONFIG_MSDOS_PARTITION=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -557,7 +557,7 @@ CONFIG_MSDOS_PARTITION=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -514,7 +514,7 @@ CONFIG_MSDOS_PARTITION=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -561,7 +561,7 @@ CONFIG_MSDOS_PARTITION=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -535,7 +535,7 @@ CONFIG_MSDOS_PARTITION=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -559,7 +559,7 @@ CONFIG_8xx_COPYBACK=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -556,7 +556,7 @@ CONFIG_8xx_COPYBACK=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -900,7 +900,7 @@ CONFIG_USB_SERIAL_VISOR=m
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Library routines
......
......@@ -521,7 +521,7 @@ CONFIG_MSDOS_PARTITION=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -594,7 +594,7 @@ CONFIG_MSDOS_PARTITION=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -469,7 +469,7 @@ CONFIG_MSDOS_PARTITION=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -972,7 +972,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -740,7 +740,7 @@ CONFIG_FONT_8x16=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -416,7 +416,7 @@ CONFIG_SUN_PARTITION=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Watchdog
......
......@@ -1024,27 +1024,27 @@ CONFIG_USB_TEST=m
#
# Bluetooth support
#
CONFIG_BLUEZ=m
CONFIG_BLUEZ_L2CAP=m
CONFIG_BLUEZ_SCO=m
CONFIG_BLUEZ_RFCOMM=m
CONFIG_BLUEZ_RFCOMM_TTY=y
CONFIG_BLUEZ_BNEP=m
CONFIG_BLUEZ_BNEP_MC_FILTER=y
CONFIG_BLUEZ_BNEP_PROTO_FILTER=y
CONFIG_BT=m
CONFIG_BT_L2CAP=m
CONFIG_BT_SCO=m
CONFIG_BT_RFCOMM=m
CONFIG_BT_RFCOMM_TTY=y
CONFIG_BT_BNEP=m
CONFIG_BT_BNEP_MC_FILTER=y
CONFIG_BT_BNEP_PROTO_FILTER=y
#
# Bluetooth device drivers
#
CONFIG_BLUEZ_HCIUSB=m
CONFIG_BLUEZ_USB_ZERO_PACKET=y
CONFIG_BLUEZ_HCIUART=m
CONFIG_BLUEZ_HCIUART_H4=y
CONFIG_BLUEZ_HCIUART_BCSP=y
# CONFIG_BLUEZ_HCIDTL1 is not set
# CONFIG_BLUEZ_HCIBT3C is not set
# CONFIG_BLUEZ_HCIBLUECARD is not set
CONFIG_BLUEZ_HCIVHCI=m
CONFIG_BT_HCIUSB=m
CONFIG_BT_USB_ZERO_PACKET=y
CONFIG_BT_HCIUART=m
CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
# CONFIG_BT_HCIDTL1 is not set
# CONFIG_BT_HCIBT3C is not set
# CONFIG_BT_HCIBLUECARD is not set
CONFIG_BT_HCIVHCI=m
#
# Watchdog
......
......@@ -590,7 +590,7 @@ CONFIG_VGA_CONSOLE=y
#
# Bluetooth support
#
# CONFIG_BLUEZ is not set
# CONFIG_BT is not set
#
# Kernel hacking
......
......@@ -6,11 +6,11 @@ if [ "$CONFIG_NET" != "n" ]; then
mainmenu_option next_comment
comment 'Bluetooth support'
dep_tristate 'Bluetooth subsystem support' CONFIG_BLUEZ $CONFIG_NET
dep_tristate 'Bluetooth subsystem support' CONFIG_BT $CONFIG_NET
if [ "$CONFIG_BLUEZ" != "n" ]; then
dep_tristate 'L2CAP protocol support' CONFIG_BLUEZ_L2CAP $CONFIG_BLUEZ
dep_tristate 'SCO links support' CONFIG_BLUEZ_SCO $CONFIG_BLUEZ
if [ "$CONFIG_BT" != "n" ]; then
dep_tristate 'L2CAP protocol support' CONFIG_BT_L2CAP $CONFIG_BT
dep_tristate 'SCO links support' CONFIG_BT_SCO $CONFIG_BT
source net/bluetooth/rfcomm/Config.in
source net/bluetooth/bnep/Config.in
source drivers/bluetooth/Config.in
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment