diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-06 17:05:09 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-06 17:05:09 +0200 |
| commit | 208807cc63754f699107bbad24687b3ae1d326fe (patch) | |
| tree | 749ada25a27d3659f1b24ae245fe6a416eeb7dae /target/linux/config/Config.in.bluetooth | |
| parent | f0b814dddb1b74c91fd54af412ad356fc68be4a2 (diff) | |
| parent | b03ac31608c2ee5349a5d098980105957a4a6bca (diff) | |
fix conflict
Diffstat (limited to 'target/linux/config/Config.in.bluetooth')
| -rw-r--r-- | target/linux/config/Config.in.bluetooth | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/config/Config.in.bluetooth b/target/linux/config/Config.in.bluetooth index 73760d14c..e7fe0cbf1 100644 --- a/target/linux/config/Config.in.bluetooth +++ b/target/linux/config/Config.in.bluetooth @@ -78,7 +78,7 @@ config ADK_KPACKAGE_KMOD_BT_HIDP Interface Device Profile. config ADK_KPACKAGE_KMOD_BT_HCIBTUSB - prompt "kmod-bt-hci-usb............ HCI USB driver" + prompt "kmod-bt-hcibtusb.......... HCI USB driver" tristate default n depends on ADK_KPACKAGE_KMOD_BT @@ -89,7 +89,7 @@ config ADK_KPACKAGE_KMOD_BT_HCIBTUSB USB interface. config ADK_KPACKAGE_KMOD_BT_HCIUART - prompt "kmod-bt-hci-uart........... HCI UART driver" + prompt "kmod-bt-hciuart........... HCI UART driver" tristate default n depends on ADK_KPACKAGE_KMOD_BT @@ -101,13 +101,13 @@ config ADK_KPACKAGE_KMOD_BT_HCIUART adapter and BrainBoxes Bluetooth PC Card. config ADK_KPACKAGE_KMOD_BT_HCIBCM203X - prompt "kmod-bt-hci-bcm203x........ HCI BCM203x USB driver" + prompt "kmod-bt-hcibcm203x........ HCI BCM203x USB driver" tristate default n select ADK_KPACKAGE_KMOD_FW_LOADER select ADK_KPACKAGE_KMOD_BT_HCIBTUSB depends on ADK_KPACKAGE_KMOD_BT - depends on ADK_LINUX_X86 || ADK_LINUX_X86_64 + depends on ADK_TARGET_WITH_USB help Bluetooth HCI BCM203x USB driver. This driver provides the firmware loading mechanism for the Broadcom |