diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-02-15 00:06:18 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-02-15 00:06:18 +0100 |
| commit | 6f99eec3dc2285abfb93631003f7e5cadf2eab0f (patch) | |
| tree | 1eaaa31eb768d8bfa68e9ff41eef53d37b64f21c /include/asm-blackfin/blackfin.h | |
| parent | f6921e3dc331293c873ec4d109fd5517a42a90b3 (diff) | |
| parent | 30942b18b66f35f2ceedab39af10e9eccaa943cc (diff) | |
| download | u-boot-imx-6f99eec3dc2285abfb93631003f7e5cadf2eab0f.zip u-boot-imx-6f99eec3dc2285abfb93631003f7e5cadf2eab0f.tar.gz u-boot-imx-6f99eec3dc2285abfb93631003f7e5cadf2eab0f.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-blackfin
Conflicts:
Makefile
doc/README.standalone
Signed-off-by: Wolfgang Denk <wd@denx.de>
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__ */ |