diff options
author | Marian Balakowicz <m8@semihalf.com> | 2008-02-21 17:18:01 +0100 |
---|---|---|
committer | Marian Balakowicz <m8@semihalf.com> | 2008-02-21 17:18:01 +0100 |
commit | 20c93959330aba8b5bbdbfde1ef319e99eba235d (patch) | |
tree | ef82297e3aeb904f94584e6d136fac55ec32c317 /include/asm-blackfin/blackfin.h | |
parent | 5cf746c303710329f8040d9c62ee354313e3e91f (diff) | |
parent | 928d1d77f8623c120d8763e20e1ca58df9c5c4c6 (diff) | |
download | u-boot-imx-20c93959330aba8b5bbdbfde1ef319e99eba235d.zip u-boot-imx-20c93959330aba8b5bbdbfde1ef319e99eba235d.tar.gz u-boot-imx-20c93959330aba8b5bbdbfde1ef319e99eba235d.tar.bz2 |
Merge branch 'master' of /home/git/u-boot
Diffstat (limited to 'include/asm-blackfin/blackfin.h')
-rw-r--r-- | include/asm-blackfin/blackfin.h | 45 |
1 files changed, 10 insertions, 35 deletions
diff --git a/include/asm-blackfin/blackfin.h b/include/asm-blackfin/blackfin.h index bf502a4..204d02b 100644 --- a/include/asm-blackfin/blackfin.h +++ b/include/asm-blackfin/blackfin.h @@ -1,40 +1,15 @@ -/* - * U-boot - blackfin.h - * - * Copyright (c) 2005-2007 Analog Devices Inc. - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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., 51 Franklin St, Fifth Floor, Boston, - * MA 02110-1301 USA +/* DO NOT EDIT THIS FILE + * Automatically generated by toolchain/trunk/proc-defs/sh/create-arch-headers.sh + * DO NOT EDIT THIS FILE */ -#ifndef _BLACKFIN_H_ -#define _BLACKFIN_H_ +#ifndef __MACH_GLOB_BLACKFIN__ +#define __MACH_GLOB_BLACKFIN__ -#if !(defined(__ASSEMBLY__) || defined(ASSEMBLY)) -# ifdef SHARED_RESOURCES -# include <asm/shared_resources.h> -# endif - -# include <linux/types.h> - -extern u_long get_sclk(void); +#include "blackfin_def.h" +#ifndef __ASSEMBLY__ +#include "blackfin_cdef.h" #endif +#include "blackfin_local.h" -#include <asm/arch-common/cdefBF5xx.h> - -#endif +#endif /* __MACH_GLOB_BLACKFIN__ */ |