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 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
[pandora-kernel.git]
/
drivers
/
staging
/
ti-st
/
st_core.h
diff --git
a/drivers/staging/ti-st/st_core.h
b/drivers/staging/ti-st/st_core.h
index
e0c32d1
..
8601320
100644
(file)
--- a/
drivers/staging/ti-st/st_core.h
+++ b/
drivers/staging/ti-st/st_core.h
@@
-117,7
+117,7
@@
int st_core_init(struct st_data_s **);
void st_core_exit(struct st_data_s *);
/* ask for reference from KIM */
-void st_kim_ref(struct st_data_s **);
+void st_kim_ref(struct st_data_s **
, int
);
#define GPS_STUB_TEST
#ifdef GPS_STUB_TEST