git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel' into next
[pandora-kernel.git]
/
drivers
/
bluetooth
/
bt3c_cs.c
diff --git
a/drivers/bluetooth/bt3c_cs.c
b/drivers/bluetooth/bt3c_cs.c
index
a18f9b8
..
593b7c5
100644
(file)
--- 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 ======================== */
/* ======================== 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];
{
char *ptr = (char *) firmware;
char b[9];
@@
-704,7
+705,7
@@
static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *
static int bt3c_config(struct pcmcia_device *link)
{
static int bt3c_config(struct pcmcia_device *link)
{
- static
kio_addr_
t base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };
+ static
unsigned in
t base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };
bt3c_info_t *info = link->priv;
tuple_t tuple;
u_short buf[256];
bt3c_info_t *info = link->priv;
tuple_t tuple;
u_short buf[256];