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' of git://git.denx.de/u-boot-sh
[platform/kernel/u-boot.git]
/
configs
/
edison_defconfig
diff --git
a/configs/edison_defconfig
b/configs/edison_defconfig
index
b99906a
..
840c87a
100644
(file)
--- a/
configs/edison_defconfig
+++ b/
configs/edison_defconfig
@@
-32,7
+32,6
@@
CONFIG_DFU_MMC=y
CONFIG_DFU_RAM=y
CONFIG_SUPPORT_EMMC_BOOT=y
CONFIG_DM_PCI_COMPAT=y
-CONFIG_RTC_MC146818=y
CONFIG_USB_DWC3_GADGET=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_MANUFACTURER="Intel"