diff options
| author | laforge <laforge@6dc7ffe9-61d6-0310-9af1-9938baff3ed1> | 2006-10-01 20:30:41 +0000 |
|---|---|---|
| committer | laforge <laforge@6dc7ffe9-61d6-0310-9af1-9938baff3ed1> | 2006-10-01 20:30:41 +0000 |
| commit | 79011bae80ab000d513a36754a857b272cded593 (patch) | |
| tree | 83e17e449804da5bed1fa6ff6330b3adc32a2d5d /firmware | |
| parent | 6c0b462a2c43d8be50df627a2856d198ef76bf39 (diff) | |
fix gcc complains about 'alarm' shadowing a global declaration
git-svn-id: https://svn.openpcd.org:2342/trunk@243 6dc7ffe9-61d6-0310-9af1-9938baff3ed1
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/include/lib_AT91SAM7.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/include/lib_AT91SAM7.h b/firmware/include/lib_AT91SAM7.h index 63943e3..f26ac54 100644 --- a/firmware/include/lib_AT91SAM7.h +++ b/firmware/include/lib_AT91SAM7.h @@ -1320,9 +1320,9 @@ static inline void AT91F_RTTClearRttIncINT( //* \brief Set RTT Alarm Value //*-------------------------------------------------------------------------------------- static inline void AT91F_RTTSetAlarmValue( - AT91PS_RTTC pRTTC, unsigned int alarm) + AT91PS_RTTC pRTTC, unsigned int _alarm) { - pRTTC->RTTC_RTAR = alarm; + pRTTC->RTTC_RTAR = _alarm; } //*-------------------------------------------------------------------------------------- |