diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-14 15:49:04 -0700 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-14 15:51:11 -0700 |
| commit | 751851af7aae9b8bd5a60b3897209081fbc18b2b (patch) | |
| tree | 5cb8dbb71d691a760da61e319796800ee42cc1c5 /drivers/bluetooth | |
| parent | a41eebab7537890409ea9dfe0fcda9b5fbdb090d (diff) | |
| parent | d71792ac3d48df6693f7b339e02494efc27036c3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Conflicts:
sound/pci/Kconfig
Diffstat (limited to 'drivers/bluetooth')
| -rw-r--r-- | drivers/bluetooth/bfusb.c | 3 | ||||
| -rw-r--r-- | drivers/bluetooth/bt3c_cs.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c index b990805806af..0c211adbc063 100644 --- a/drivers/bluetooth/bfusb.c +++ b/drivers/bluetooth/bfusb.c @@ -566,7 +566,8 @@ static int bfusb_ioctl(struct hci_dev *hdev, unsigned int cmd, unsigned long arg return -ENOIOCTLCMD; } -static int bfusb_load_firmware(struct bfusb_data *data, unsigned char *firmware, int count) +static int bfusb_load_firmware(struct bfusb_data *data, + const unsigned char *firmware, int count) { unsigned char *buf; int err, pipe, len, size, sent = 0; diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c index 7703d6e06fd9..593b7c595038 100644 --- a/drivers/bluetooth/bt3c_cs.c +++ b/drivers/bluetooth/bt3c_cs.c @@ -470,7 +470,8 @@ static int bt3c_hci_ioctl(struct hci_dev *hdev, unsigned int cmd, unsigned long /* ======================== Card services HCI interaction ======================== */ -static int bt3c_load_firmware(bt3c_info_t *info, unsigned char *firmware, int count) +static int bt3c_load_firmware(bt3c_info_t *info, const unsigned char *firmware, + int count) { char *ptr = (char *) firmware; char b[9]; |