diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2009-02-08 19:36:13 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2009-02-08 19:36:13 +0000 |
| commit | 7085e5331ecdcf4f1c314f95c9059014a805db92 (patch) | |
| tree | 2083a7a4327af2e9bc154c2ecbf2165b9b15cf5c /target/linux/pxa/patches-2.6.21/017-modular-init-bluetooth.patch | |
| parent | 29e1ac054cebd1b0309aaa1465bb04ebcad5d858 (diff) | |
| download | upstream-7085e5331ecdcf4f1c314f95c9059014a805db92.tar.gz upstream-7085e5331ecdcf4f1c314f95c9059014a805db92.tar.bz2 upstream-7085e5331ecdcf4f1c314f95c9059014a805db92.zip | |
refresh 2.6.21 patches
SVN-Revision: 14454
Diffstat (limited to 'target/linux/pxa/patches-2.6.21/017-modular-init-bluetooth.patch')
| -rw-r--r-- | target/linux/pxa/patches-2.6.21/017-modular-init-bluetooth.patch | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/target/linux/pxa/patches-2.6.21/017-modular-init-bluetooth.patch b/target/linux/pxa/patches-2.6.21/017-modular-init-bluetooth.patch index 108a4ca8ed..306cc8e8e3 100644 --- a/target/linux/pxa/patches-2.6.21/017-modular-init-bluetooth.patch +++ b/target/linux/pxa/patches-2.6.21/017-modular-init-bluetooth.patch @@ -1,7 +1,5 @@ -Index: linux-2.6.21.7/net/bluetooth/Kconfig -=================================================================== ---- linux-2.6.21.7.orig/net/bluetooth/Kconfig -+++ linux-2.6.21.7/net/bluetooth/Kconfig +--- a/net/bluetooth/Kconfig ++++ b/net/bluetooth/Kconfig @@ -30,6 +30,12 @@ menuconfig BT Bluetooth kernel modules are provided in the BlueZ packages. For more information, see <http://www.bluez.org/>. @@ -15,10 +13,8 @@ Index: linux-2.6.21.7/net/bluetooth/Kconfig config BT_L2CAP tristate "L2CAP protocol support" depends on BT -Index: linux-2.6.21.7/net/bluetooth/Makefile -=================================================================== ---- linux-2.6.21.7.orig/net/bluetooth/Makefile -+++ linux-2.6.21.7/net/bluetooth/Makefile +--- a/net/bluetooth/Makefile ++++ b/net/bluetooth/Makefile @@ -9,5 +9,6 @@ obj-$(CONFIG_BT_RFCOMM) += rfcomm/ obj-$(CONFIG_BT_BNEP) += bnep/ obj-$(CONFIG_BT_CMTP) += cmtp/ @@ -26,10 +22,8 @@ Index: linux-2.6.21.7/net/bluetooth/Makefile +obj-$(CONFIG_BT_GUMSTIX)+= gumstix_bluetooth.o bluetooth-objs := af_bluetooth.o hci_core.o hci_conn.o hci_event.o hci_sock.o hci_sysfs.o lib.o -Index: linux-2.6.21.7/net/bluetooth/af_bluetooth.c -=================================================================== ---- linux-2.6.21.7.orig/net/bluetooth/af_bluetooth.c -+++ linux-2.6.21.7/net/bluetooth/af_bluetooth.c +--- a/net/bluetooth/af_bluetooth.c ++++ b/net/bluetooth/af_bluetooth.c @@ -327,12 +327,20 @@ static struct net_proto_family bt_sock_f .create = bt_sock_create, }; @@ -51,10 +45,8 @@ Index: linux-2.6.21.7/net/bluetooth/af_bluetooth.c err = bt_sysfs_init(); if (err < 0) return err; -Index: linux-2.6.21.7/net/bluetooth/gumstix_bluetooth.c -=================================================================== --- /dev/null -+++ linux-2.6.21.7/net/bluetooth/gumstix_bluetooth.c ++++ b/net/bluetooth/gumstix_bluetooth.c @@ -0,0 +1,50 @@ +/* + * Gumstix bluetooth module intialization driver |