diff options
author | Peter Pearse <peter.pearse@arm.com> | 2007-04-19 13:17:20 +0100 |
---|---|---|
committer | Peter Pearse <peter.pearse@arm.com> | 2007-04-19 13:17:20 +0100 |
commit | ee89bf2782406b1f87088b4764aeb6f811d82526 (patch) | |
tree | b144476f4b5e92a414efff165d214d34062d4365 /include/asm-blackfin/delay.h | |
parent | 9c00dfb0bf89c8c23e8af5b5bdf49cf66d769f85 (diff) | |
parent | 37837828d89084879bee2f2b8c7c68d4695940df (diff) |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'include/asm-blackfin/delay.h')
-rw-r--r-- | include/asm-blackfin/delay.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/asm-blackfin/delay.h b/include/asm-blackfin/delay.h index dbb73887ef..ea0b3664e0 100644 --- a/include/asm-blackfin/delay.h +++ b/include/asm-blackfin/delay.h @@ -1,7 +1,7 @@ /* * 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. @@ -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 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USA */ #ifndef _BLACKFIN_DELAY_H @@ -35,9 +35,9 @@ 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)); } /* |