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 /cpu/bf561/interrupts.c | |
| 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 'cpu/bf561/interrupts.c')
| -rw-r--r-- | cpu/bf561/interrupts.c | 4 | 
1 files changed, 0 insertions, 4 deletions
| diff --git a/cpu/bf561/interrupts.c b/cpu/bf561/interrupts.c index ecbc6addf..78800611a 100644 --- a/cpu/bf561/interrupts.c +++ b/cpu/bf561/interrupts.c @@ -35,8 +35,6 @@   */  #include <common.h> -#include <asm/machdep.h> -#include <asm/irq.h>  #include <config.h>  #include <asm/blackfin.h>  #include "cpu.h" @@ -72,12 +70,10 @@ ulong get_tbclk(void)  void enable_interrupts(void)  { -	restore_flags(int_flag);  }  int disable_interrupts(void)  { -	save_and_cli(int_flag);  	return 1;  } |