git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'stable-3.2' into pandora-3.2
[pandora-kernel.git]
/
arch
/
arm
/
configs
/
magician_defconfig
diff --git
a/arch/arm/configs/magician_defconfig
b/arch/arm/configs/magician_defconfig
index
a88e64d
..
443675d
100644
(file)
--- a/
arch/arm/configs/magician_defconfig
+++ b/
arch/arm/configs/magician_defconfig
@@
-132,7
+132,7
@@
CONFIG_USB_MON=m
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_VBUS_DRAW=500
-CONFIG_USB_
GADGET_
PXA27X=y
+CONFIG_USB_PXA27X=y
CONFIG_USB_ETH=m
# CONFIG_USB_ETH_RNDIS is not set
CONFIG_USB_GADGETFS=m