diff options
author | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-11 10:41:07 +0300 |
---|---|---|
committer | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-13 08:17:18 +0300 |
commit | e09b41010ba33a20a87472ee821fa407a5b8da36 (patch) | |
tree | d10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/drivers/staging/nvec/nvec.h | |
parent | f93b97fd65072de626c074dbe099a1fff05ce060 (diff) |
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
are taken from kernel.org, and rt patch from the rt wiki download page.
During the rebasing, the following patch collided:
Force tick interrupt and get rid of softirq magic(I70131fb85).
Collisions have been removed because its logic was found on the
source already.
Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769
Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/drivers/staging/nvec/nvec.h')
-rw-r--r-- | kernel/drivers/staging/nvec/nvec.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/kernel/drivers/staging/nvec/nvec.h b/kernel/drivers/staging/nvec/nvec.h index e27137505..2ec9de906 100644 --- a/kernel/drivers/staging/nvec/nvec.h +++ b/kernel/drivers/staging/nvec/nvec.h @@ -165,19 +165,18 @@ struct nvec_chip { int state; }; -extern int nvec_write_async(struct nvec_chip *nvec, const unsigned char *data, - short size); +int nvec_write_async(struct nvec_chip *nvec, const unsigned char *data, + short size); -extern struct nvec_msg *nvec_write_sync(struct nvec_chip *nvec, - const unsigned char *data, short size); +struct nvec_msg *nvec_write_sync(struct nvec_chip *nvec, + const unsigned char *data, short size); -extern int nvec_register_notifier(struct nvec_chip *nvec, - struct notifier_block *nb, - unsigned int events); +int nvec_register_notifier(struct nvec_chip *nvec, + struct notifier_block *nb, + unsigned int events); -extern int nvec_unregister_notifier(struct nvec_chip *dev, - struct notifier_block *nb); +int nvec_unregister_notifier(struct nvec_chip *dev, struct notifier_block *nb); -extern void nvec_msg_free(struct nvec_chip *nvec, struct nvec_msg *msg); +void nvec_msg_free(struct nvec_chip *nvec, struct nvec_msg *msg); #endif |