projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'regulator/topic/act8865', 'regulator/topic/arizona...
[cascardo/linux.git]
/
arch
/
arm
/
configs
/
vexpress_defconfig
diff --git
a/arch/arm/configs/vexpress_defconfig
b/arch/arm/configs/vexpress_defconfig
index
f489fda
..
37fe607
100644
(file)
--- a/
arch/arm/configs/vexpress_defconfig
+++ b/
arch/arm/configs/vexpress_defconfig
@@
-118,8
+118,8
@@
CONFIG_HID_ZEROPLUS=y
CONFIG_USB=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
CONFIG_USB_MON=y
-CONFIG_USB_ISP1760_HCD=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_ISP1760=y
CONFIG_MMC=y
CONFIG_MMC_ARMMMCI=y
CONFIG_NEW_LEDS=y