diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-04-12 22:07:57 +0200 | 
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-04-12 22:07:57 +0200 | 
| commit | 18122019972ca639ee3b581257e3a63ff7c8efeb (patch) | |
| tree | 52f7223e7c63f43322f3eee4722743e12190a19f /drivers/net/npe/include/IxTimeSyncAcc.h | |
| parent | 90639feaa0d66a204f9d03a325ab14e2f97f6cbb (diff) | |
| parent | 785881f775252940185e10fbb2d5299c9ffa6bce (diff) | |
| download | olio-uboot-2014.01-18122019972ca639ee3b581257e3a63ff7c8efeb.tar.xz olio-uboot-2014.01-18122019972ca639ee3b581257e3a63ff7c8efeb.zip | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts:
	drivers/video/exynos_fb.c
Diffstat (limited to 'drivers/net/npe/include/IxTimeSyncAcc.h')
| -rw-r--r-- | drivers/net/npe/include/IxTimeSyncAcc.h | 8 | 
1 files changed, 4 insertions, 4 deletions
| diff --git a/drivers/net/npe/include/IxTimeSyncAcc.h b/drivers/net/npe/include/IxTimeSyncAcc.h index 25effed90..52c4c1cfa 100644 --- a/drivers/net/npe/include/IxTimeSyncAcc.h +++ b/drivers/net/npe/include/IxTimeSyncAcc.h @@ -497,8 +497,8 @@ ixTimeSyncAccTargetTimeInterruptDisable(void);   * the Target Time in the IEEE 1588 hardware assist block. If the condition is   * true an event flag is set in the hardware.   * - * @param ttmPollFlag [out] - TRUE  if the target time reached/hit condition event set - *                            FALSE if the target time reached/hit condition event is  + * @param ttmPollFlag [out] - true  if the target time reached/hit condition event set + *                            false if the target time reached/hit condition event is                                      not set   * @param targetTime [out] - Capture current targetTime into client provided buffer   * @@ -656,9 +656,9 @@ ixTimeSyncAccAuxTimeInterruptDisable(IxTimeSyncAccAuxMode auxMode);   * (Master or Slave)   *   * @param auxMode [in] - Auxiliary Snapshot Register (Slave or Master) to be checked - * @param auxPollFlag [out] - TRUE if the time stamp captured in auxiliary  + * @param auxPollFlag [out] - true if the time stamp captured in auxiliary                                     snapshot register - *                            FALSE if the time stamp not captured in  + *                            false if the time stamp not captured in                                     auxiliary snapshot register   * @param auxTime [out] - Copy the current Auxiliary Snapshot Register value into the   * client provided buffer |