projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.denx.de/u-boot-fsl-qoriq
[oweals/u-boot.git]
/
arch
/
powerpc
/
include
/
asm
/
global_data.h
diff --git
a/arch/powerpc/include/asm/global_data.h
b/arch/powerpc/include/asm/global_data.h
index 4090975bf5e79224b837bb5321d2bfe371e23805..3943d0e92b9e4f01829796c107bfd2abb7290042 100644
(file)
--- a/
arch/powerpc/include/asm/global_data.h
+++ b/
arch/powerpc/include/asm/global_data.h
@@
-96,7
+96,7
@@
struct arch_global_data {
unsigned long arbiter_event_attributes;
unsigned long arbiter_event_address;
#endif
-#if defined(CONFIG_
SYS_ALLOC_DPRAM) || defined(CONFIG_
CPM2)
+#if defined(CONFIG_CPM2)
unsigned int dp_alloc_base;
unsigned int dp_alloc_top;
#endif