projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
arm
/
configs
/
colibri_pxa270_defconfig
diff --git
a/arch/arm/configs/colibri_pxa270_defconfig
b/arch/arm/configs/colibri_pxa270_defconfig
index
2ef2c5e
..
18c311a
100644
(file)
--- a/
arch/arm/configs/colibri_pxa270_defconfig
+++ b/
arch/arm/configs/colibri_pxa270_defconfig
@@
-124,7
+124,6
@@
CONFIG_FONT_8x16=y
CONFIG_LOGO=y
# CONFIG_USB_HID is not set
CONFIG_USB=y
-CONFIG_USB_DEVICEFS=y
# CONFIG_USB_DEVICE_CLASS is not set
CONFIG_USB_SERIAL=m
CONFIG_USB_GADGET=m