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 remote-tracking branch 'u-boot/master' into u-boot-arm-merged
[platform/kernel/u-boot.git]
/
include
/
configs
/
s5pc210_universal.h
diff --git
a/include/configs/s5pc210_universal.h
b/include/configs/s5pc210_universal.h
index
035c27f
..
eb13bb3
100644
(file)
--- a/
include/configs/s5pc210_universal.h
+++ b/
include/configs/s5pc210_universal.h
@@
-256,9
+256,9
@@
#define CONFIG_I2C_MULTI_BUS
#define CONFIG_SYS_MAX_I2C_BUS 7
#define CONFIG_I2C_MULTI_BUS
#define CONFIG_SYS_MAX_I2C_BUS 7
-#define CONFIG_P
MIC
-#define CONFIG_P
MIC
_I2C
-#define CONFIG_P
MIC
_MAX8998
+#define CONFIG_P
OWER
+#define CONFIG_P
OWER
_I2C
+#define CONFIG_P
OWER
_MAX8998
#define CONFIG_USB_GADGET
#define CONFIG_USB_GADGET_S3C_UDC_OTG
#define CONFIG_USB_GADGET
#define CONFIG_USB_GADGET_S3C_UDC_OTG