projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-arm
[oweals/u-boot.git]
/
include
/
asm-blackfin
/
delay.h
diff --git
a/include/asm-blackfin/delay.h
b/include/asm-blackfin/delay.h
index dbb73887efd7db366157255dcb63c94859ace27e..ea0b3664e01bf690254cdeff9540d3f0f49e2059 100644
(file)
--- a/
include/asm-blackfin/delay.h
+++ b/
include/asm-blackfin/delay.h
@@
-1,7
+1,7
@@
/*
* U-boot - delay.h Routines for introducing delays
*
/*
* U-boot - delay.h Routines for introducing delays
*
- * Copyright (c) 2005
blackfin.uclinux.org
+ * Copyright (c) 2005
-2007 Analog Devices Inc.
*
* See file CREDITS for list of people who contributed to this
* project.
*
* See file CREDITS for list of people who contributed to this
* project.
@@
-18,8
+18,8
@@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 5
9 Temple Place, Suite 330
, Boston,
- * MA 0211
1-1307
USA
+ * Foundation, Inc., 5
1 Franklin St, Fifth Floor
, Boston,
+ * MA 0211
0-1301
USA
*/
#ifndef _BLACKFIN_DELAY_H
*/
#ifndef _BLACKFIN_DELAY_H
@@
-35,9
+35,9
@@
extern __inline__ void __delay(unsigned long loops)
{
__asm__ __volatile__("1:\t%0 += -1;\n\t"
extern __inline__ void __delay(unsigned long loops)
{
__asm__ __volatile__("1:\t%0 += -1;\n\t"
-
"cc = %0 == 0;\n\t"
-
"if ! cc jump 1b;\n":"=d"(loops)
-
:"0"(loops));
+ "cc = %0 == 0;\n\t"
+ "if ! cc jump 1b;\n":"=d"(loops)
+ :"0"(loops));
}
/*
}
/*