Skip to content

Commit

Permalink
Revert "Defconfig: disable bluetooth until working"
Browse files Browse the repository at this point in the history
This reverts commit 70c2604.
  • Loading branch information
dalingrin committed May 10, 2011
1 parent 88ada0a commit f5ba10e
Showing 1 changed file with 26 additions and 4 deletions.
30 changes: 26 additions & 4 deletions arch/arm/configs/omap3621_evt1a_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.32.9
# Mon May 9 17:30:19 2011
# Mon May 9 03:53:32 2011
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
Expand Down Expand Up @@ -662,7 +662,28 @@ CONFIG_WAN_ROUTER=y
# CONFIG_HAMRADIO is not set
# CONFIG_CAN is not set
# CONFIG_IRDA is not set
# CONFIG_BT is not set
CONFIG_BT=y
CONFIG_BT_L2CAP=y
CONFIG_BT_SCO=y
CONFIG_BT_RFCOMM=y
CONFIG_BT_RFCOMM_TTY=y
CONFIG_BT_BNEP=y
CONFIG_BT_BNEP_MC_FILTER=y
CONFIG_BT_BNEP_PROTO_FILTER=y
CONFIG_BT_HIDP=y

#
# Bluetooth device drivers
#
# CONFIG_BT_HCIBTUSB is not set
# CONFIG_BT_HCIBTSDIO is not set
# CONFIG_BT_HCIUART is not set
# CONFIG_BT_HCIBCM203X is not set
# CONFIG_BT_HCIBPA10X is not set
# CONFIG_BT_HCIBFUSB is not set
# CONFIG_BT_HCIVHCI is not set
# CONFIG_BT_MRVL is not set
CONFIG_BT_WILINK=y
# CONFIG_AF_RXRPC is not set
CONFIG_FIB_RULES=y
CONFIG_WIRELESS=y
Expand Down Expand Up @@ -760,8 +781,8 @@ CONFIG_ENCORE_MODEM_MGR=y
#
# Texas Instruments shared transport line discipline
#
# CONFIG_TI_ST is not set
# CONFIG_TI_ST_BT is not set
CONFIG_TI_ST=y
CONFIG_TI_ST_BT=y
# CONFIG_TI_ST_FM is not set
# CONFIG_TI_ST_GPS is not set
CONFIG_HAVE_IDE=y
Expand Down Expand Up @@ -1467,6 +1488,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
CONFIG_SND_SOC_TLV320DAC3100=y
# CONFIG_SOUND_PRIME is not set
# CONFIG_HID_SUPPORT is not set
CONFIG_HID=y
CONFIG_USB_SUPPORT=y
CONFIG_USB_ARCH_HAS_HCD=y
CONFIG_USB_ARCH_HAS_OHCI=y
Expand Down

0 comments on commit f5ba10e

Please sign in to comment.