diff options
| author | Stefano Babic <sbabic@denx.de> | 2016-05-24 14:55:06 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2016-05-24 14:55:06 +0200 |
| commit | 08ca213acadef61748dc62d48b0f5c4bed8b8c2d (patch) | |
| tree | 36cf415b78775ee63acdfc34d636d2b7d7936a78 /arch/m68k/include/asm/config.h | |
| parent | d15a244b059e361475302bccd471e65a48ee2b1f (diff) | |
| parent | d7d000311285e4b8d11e089ca13ea456a01be3b8 (diff) | |
| download | blackbird-obmc-uboot-08ca213acadef61748dc62d48b0f5c4bed8b8c2d.tar.gz blackbird-obmc-uboot-08ca213acadef61748dc62d48b0f5c4bed8b8c2d.zip | |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'arch/m68k/include/asm/config.h')
| -rw-r--r-- | arch/m68k/include/asm/config.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/m68k/include/asm/config.h b/arch/m68k/include/asm/config.h index e1458acd2c..9c4d3fb8fd 100644 --- a/arch/m68k/include/asm/config.h +++ b/arch/m68k/include/asm/config.h @@ -7,8 +7,6 @@ #ifndef _ASM_CONFIG_H_ #define _ASM_CONFIG_H_ -#define CONFIG_SYS_GENERIC_GLOBAL_DATA - #define CONFIG_NEEDS_MANUAL_RELOC #define CONFIG_LMB |
