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/hw_irq.h | |
| parent | f6921e3dc331293c873ec4d109fd5517a42a90b3 (diff) | |
| parent | 30942b18b66f35f2ceedab39af10e9eccaa943cc (diff) | |
| download | olio-uboot-2014.01-6f99eec3dc2285abfb93631003f7e5cadf2eab0f.tar.xz olio-uboot-2014.01-6f99eec3dc2285abfb93631003f7e5cadf2eab0f.zip | |
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/hw_irq.h')
| -rw-r--r-- | include/asm-blackfin/hw_irq.h | 43 | 
1 files changed, 0 insertions, 43 deletions
| diff --git a/include/asm-blackfin/hw_irq.h b/include/asm-blackfin/hw_irq.h deleted file mode 100644 index 9b360553c..000000000 --- a/include/asm-blackfin/hw_irq.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * U-boot - hw_irq.h - * - * Copyright (c) 2005-2007 Analog Devices Inc. - * - * This file is based on - * linux/arch/$(ARCH)/platform/$(PLATFORM)/hw_irq.h - * BlackFin (ADI) assembler restricted values by Ted Ma <mated@sympatico.ca> - * Copyright (c) 2002 Arcturus Networks Inc. (www.arcturusnetworks.com) - * Copyright (c) 2002 Lineo, Inc <mattw@lineo.com> - * - * 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 - */ - -#include <linux/config.h> -#ifdef CONFIG_EZKIT533 -#include <asm/arch-bf533/irq.h> -#endif -#ifdef CONFIG_EZKIT561 -#include <asm/arch-bf561/irq.h> -#endif -#ifdef CONFIG_STAMP -#include <asm/arch-bf533/irq.h> -#endif -#ifdef CONFIG_BF537 -#include <asm/arch-bf537/irq.h> -#endif |