Fix files that escaped CONFIG_BLUEZ_XXX -> CONFIG_BT_XXX cleanup.

Mostly arch specific default configs.

arch/alpha/defconfig

@@ -808,7 +808,7 @@ CONFIG_SOUND_GAMEPORT=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/arm/def-configs/adi_evb

@@ -664,7 +664,7 @@ CONFIG_PARTITION_ADVANCED=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/arm/def-configs/adsbitsy

@@ -649,7 +649,7 @@ CONFIG_USB_MOUSE=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/arm/def-configs/anakin

@@ -605,7 +605,7 @@ CONFIG_FONT_8x16=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/arm/def-configs/assabet

@@ -949,7 +949,7 @@ CONFIG_SWITCHES_UCB1X00=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/arm/def-configs/badge4

@@ -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

arch/arm/def-configs/cerfcube

@@ -858,7 +858,7 @@ CONFIG_PC_KEYMAP=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/arm/def-configs/cerfpda

@@ -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

arch/arm/def-configs/cerfpod

@@ -879,7 +879,7 @@ CONFIG_FONT_8x16=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/arm/def-configs/epxa10db

@@ -673,7 +673,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/arm/def-configs/flexanet

@@ -881,7 +881,7 @@ CONFIG_SOUND=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/arm/def-configs/fortunet

@@ -572,7 +572,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/arm/def-configs/graphicsclient

@@ -717,7 +717,7 @@ CONFIG_FONT_8x16=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/arm/def-configs/graphicsmaster

@@ -730,7 +730,7 @@ CONFIG_USB_MOUSE=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/arm/def-configs/h3600

@@ -934,7 +934,7 @@ CONFIG_SOUND_H3600_UDA1341=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/arm/def-configs/iq80310

@@ -781,7 +781,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/arm/def-configs/jornada720

@@ -876,7 +876,7 @@ CONFIG_SOUND_SA1100=m
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/arm/def-configs/lart

@@ -878,7 +878,7 @@ CONFIG_SOUND_SA1100SSP=m
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/arm/def-configs/lubbock

@@ -855,7 +855,7 @@ CONFIG_SOUND_PRIME=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/arm/def-configs/neponset

@@ -1099,7 +1099,7 @@ CONFIG_USB_OHCI_SA1111=m
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/arm/def-configs/pangolin

@@ -727,7 +727,7 @@ CONFIG_SOUND_PANGOLIN_UDA1341=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/arm/def-configs/pleb

@@ -520,7 +520,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/arm/def-configs/shannon

@@ -721,7 +721,7 @@ CONFIG_MCP_UCB1200_TS=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/arm/def-configs/shark

@@ -912,7 +912,7 @@ CONFIG_SOUND_SB=m
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/arm/def-configs/stork

@@ -941,7 +941,7 @@ CONFIG_SOUND_H3600_UDA1341=m
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/arm/def-configs/system3

@@ -947,7 +947,7 @@ CONFIG_USB_USBNET=m
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/i386/defconfig

@@ -1138,7 +1138,7 @@ CONFIG_USB_STORAGE=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ia64/defconfig

@@ -919,7 +919,7 @@ CONFIG_USB_MOUSE=m
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ia64/sn/configs/sn1/defconfig-bigsur-mp

@@ -741,7 +741,7 @@ CONFIG_VGA_CONSOLE=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ia64/sn/configs/sn1/defconfig-bigsur-sp

@@ -741,7 +741,7 @@ CONFIG_VGA_CONSOLE=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ia64/sn/configs/sn1/defconfig-sn1-mp

@@ -702,7 +702,7 @@ CONFIG_NLS_DEFAULT="n"
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ia64/sn/configs/sn1/defconfig-sn1-mp-modules

@@ -704,7 +704,7 @@ CONFIG_NLS_DEFAULT="n"
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ia64/sn/configs/sn1/defconfig-sn1-mp-syn1-0

@@ -702,7 +702,7 @@ CONFIG_NLS_DEFAULT="n"
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ia64/sn/configs/sn1/defconfig-sn1-sp

@@ -702,7 +702,7 @@ CONFIG_NLS_DEFAULT="n"
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ia64/sn/configs/sn2/defconfig-sn2-mp

@@ -701,7 +701,7 @@ CONFIG_NLS_DEFAULT="n"
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ia64/sn/configs/sn2/defconfig-sn2-mp-modules

@@ -703,7 +703,7 @@ CONFIG_NLS_DEFAULT="n"
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ia64/sn/configs/sn2/defconfig-sn2-sp

@@ -701,7 +701,7 @@ CONFIG_NLS_DEFAULT="n"
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/FADS_defconfig

@@ -466,7 +466,7 @@ CONFIG_8xx_COPYBACK=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/IVMS8_defconfig

@@ -587,7 +587,7 @@ CONFIG_8xx_COPYBACK=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/SM850_defconfig

@@ -559,7 +559,7 @@ CONFIG_8xx_CPU6=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/SPD823TS_defconfig

@@ -558,7 +558,7 @@ CONFIG_8xx_COPYBACK=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/TQM823L_defconfig

@@ -559,7 +559,7 @@ CONFIG_8xx_COPYBACK=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/TQM850L_defconfig

@@ -559,7 +559,7 @@ CONFIG_8xx_CPU6=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/TQM860L_defconfig

@@ -618,7 +618,7 @@ CONFIG_8xx_COPYBACK=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/adir_defconfig

@@ -637,7 +637,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/apus_defconfig

@@ -925,7 +925,7 @@ CONFIG_SOUND_VMIDI=m
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/ash_defconfig

@@ -558,7 +558,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/bseip_defconfig

@@ -558,7 +558,7 @@ CONFIG_8xx_COPYBACK=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/cedar_defconfig

@@ -600,7 +600,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/common_defconfig

@@ -972,7 +972,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/cpci405_defconfig

@@ -624,7 +624,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/ep405_defconfig

@@ -594,7 +594,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/est8260_defconfig

@@ -529,7 +529,7 @@ CONFIG_SCC1_ENET=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/ev64260_defconfig

@@ -596,7 +596,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/gemini_defconfig

@@ -626,7 +626,7 @@ CONFIG_SOLARIS_X86_PARTITION=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/iSeries_defconfig

@@ -466,7 +466,7 @@ CONFIG_NLS_ISO8859_1=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/ibmchrp_defconfig

@@ -808,7 +808,7 @@ CONFIG_NLS_ISO8859_1=m
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/k2_defconfig

@@ -614,7 +614,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/lopec_defconfig

@@ -873,7 +873,7 @@ CONFIG_USB_SERIAL_VISOR=m
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Library routines

arch/ppc/configs/mbx_defconfig

@@ -551,7 +551,7 @@ CONFIG_8xx_CPU6=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/mcpn765_defconfig

@@ -464,7 +464,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/menf1_defconfig

@@ -660,7 +660,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/oak_defconfig

@@ -573,7 +573,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/pmac_defconfig

@@ -1052,7 +1052,7 @@ CONFIG_USB_SERIAL_VISOR=m
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/power3_defconfig

@@ -830,7 +830,7 @@ CONFIG_SOUND_TVMIXER=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/pplus_defconfig

@@ -756,7 +756,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/prpmc750_defconfig

@@ -557,7 +557,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/prpmc800_defconfig

@@ -514,7 +514,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/redwood5_defconfig

@@ -561,7 +561,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/redwood_defconfig

@@ -535,7 +535,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/rpxcllf_defconfig

@@ -559,7 +559,7 @@ CONFIG_8xx_COPYBACK=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/rpxlite_defconfig

@@ -556,7 +556,7 @@ CONFIG_8xx_COPYBACK=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/sandpoint_defconfig

@@ -900,7 +900,7 @@ CONFIG_USB_SERIAL_VISOR=m
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Library routines

arch/ppc/configs/spruce_defconfig

@@ -521,7 +521,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/walnut_defconfig

@@ -594,7 +594,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/configs/zx4500_defconfig

@@ -469,7 +469,7 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc/defconfig

@@ -972,7 +972,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/ppc64/defconfig

@@ -740,7 +740,7 @@ CONFIG_FONT_8x16=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

arch/sparc/defconfig

@@ -416,7 +416,7 @@ CONFIG_SUN_PARTITION=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Watchdog

arch/sparc64/defconfig

@@ -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

arch/x86_64/defconfig

@@ -590,7 +590,7 @@ CONFIG_VGA_CONSOLE=y
 #
 # Bluetooth support
 #
-# CONFIG_BLUEZ is not set
+# CONFIG_BT is not set
 
 #
 # Kernel hacking

drivers/bluetooth/Makefile

@@ -2,7 +2,7 @@
 # Makefile for the Linux Bluetooth HCI device drivers.
 #
 
-obj-$(CONFIG_BT_HCIUSB)	+= hci_usb.o
+obj-$(CONFIG_BT_HCIUSB)		+= hci_usb.o
 obj-$(CONFIG_BT_HCIVHCI)	+= hci_vhci.o
 obj-$(CONFIG_BT_HCIUART)	+= hci_uart.o
 obj-$(CONFIG_BT_HCIDTL1)	+= dtl1_cs.o

net/bluetooth/Config.in

@@ -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

net/bluetooth/Makefile

@@ -4,9 +4,9 @@
 
 export-objs := syms.o
 
-obj-$(CONFIG_BT)		+= bluetooth.o
+obj-$(CONFIG_BT)	+= bluetooth.o
 obj-$(CONFIG_BT_L2CAP)	+= l2cap.o
-obj-$(CONFIG_BT_SCO)		+= sco.o
+obj-$(CONFIG_BT_SCO)	+= sco.o
 obj-$(CONFIG_BT_RFCOMM)	+= rfcomm/
 obj-$(CONFIG_BT_BNEP)	+= bnep/