projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'
[platform/kernel/u-boot.git]
/
arch
/
sandbox
/
include
/
asm
/
config.h
diff --git
a/arch/sandbox/include/asm/config.h
b/arch/sandbox/include/asm/config.h
index
6c1bff9
..
ec7729e
100644
(file)
--- a/
arch/sandbox/include/asm/config.h
+++ b/
arch/sandbox/include/asm/config.h
@@
-7,7
+7,6
@@
#ifndef _ASM_CONFIG_H_
#define _ASM_CONFIG_H_
-#define CONFIG_SYS_GENERIC_GLOBAL_DATA
#define CONFIG_SANDBOX_ARCH
/* Used by drivers/spi/sandbox_spi.c and arch/sandbox/include/asm/state.h */