diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-14 18:49:04 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-14 18:51:11 -0400 |
| commit | 751851af7aae9b8bd5a60b3897209081fbc18b2b (patch) | |
| tree | 5cb8dbb71d691a760da61e319796800ee42cc1c5 /drivers/bluetooth/bt3c_cs.c | |
| 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/bt3c_cs.c')
| -rw-r--r-- | drivers/bluetooth/bt3c_cs.c | 3 |
1 files changed, 2 insertions, 1 deletions
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 | |||
| 470 | /* ======================== Card services HCI interaction ======================== */ | 470 | /* ======================== Card services HCI interaction ======================== */ |
| 471 | 471 | ||
| 472 | 472 | ||
| 473 | static int bt3c_load_firmware(bt3c_info_t *info, unsigned char *firmware, int count) | 473 | static int bt3c_load_firmware(bt3c_info_t *info, const unsigned char *firmware, |
| 474 | int count) | ||
| 474 | { | 475 | { |
| 475 | char *ptr = (char *) firmware; | 476 | char *ptr = (char *) firmware; |
| 476 | char b[9]; | 477 | char b[9]; |