projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'torvalds/master' into perf/core
[linux-2.6-microblaze.git]
/
include
/
linux
/
ptp_clock_kernel.h
diff --git
a/include/linux/ptp_clock_kernel.h
b/include/linux/ptp_clock_kernel.h
index
0d47fd3
..
51d7f1b
100644
(file)
--- a/
include/linux/ptp_clock_kernel.h
+++ b/
include/linux/ptp_clock_kernel.h
@@
-235,7
+235,7
@@
extern int ptp_clock_index(struct ptp_clock *ptp);
* @ppm: Parts per million, but with a 16 bit binary fractional field
*/
* @ppm: Parts per million, but with a 16 bit binary fractional field
*/
-extern
s32
scaled_ppm_to_ppb(long ppm);
+extern
long
scaled_ppm_to_ppb(long ppm);
/**
* ptp_find_pin() - obtain the pin index of a given auxiliary function
/**
* ptp_find_pin() - obtain the pin index of a given auxiliary function