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 'master' into next
[platform/kernel/u-boot.git]
/
include
/
configs
/
x86-common.h
diff --git
a/include/configs/x86-common.h
b/include/configs/x86-common.h
index
f421ec5
..
c1c5a09
100644
(file)
--- a/
include/configs/x86-common.h
+++ b/
include/configs/x86-common.h
@@
-44,7
+44,7
@@
#define CFG_EXTRA_ENV_SETTINGS \
DISTRO_BOOTENV \
- C
ONFIG_STD_DEVICES_SETTINGS
\
+ C
FG_STD_DEVICES_SETTINGS
\
SPLASH_SETTINGS \
"pciconfighost=1\0" \
"netdev=eth0\0" \