git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-5.1/i2c-hid' into for-linus
[sfrench/cifs-2.6.git]
/
drivers
/
hid
/
intel-ish-hid
/
ishtp
/
bus.h
diff --git
a/drivers/hid/intel-ish-hid/ishtp/bus.h
b/drivers/hid/intel-ish-hid/ishtp/bus.h
index babf19ba3ff618dc8764fd5d651fe0cbf3390fc7..4cf7ad586c37da4eb45d53e9e3c368aa6ccd1270 100644
(file)
--- a/
drivers/hid/intel-ish-hid/ishtp/bus.h
+++ b/
drivers/hid/intel-ish-hid/ishtp/bus.h
@@
-85,7
+85,7
@@
int ishtp_send_msg(struct ishtp_device *dev,
/* Write a single-fragment message */
int ishtp_write_message(struct ishtp_device *dev,
struct ishtp_msg_hdr *hdr,
-
unsigned char
*buf);
+
void
*buf);
/* Use DMA to send/receive messages */
int ishtp_use_dma_transfer(void);