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
/
cm_x300_defconfig
diff --git
a/arch/arm/configs/cm_x300_defconfig
b/arch/arm/configs/cm_x300_defconfig
index
f4b7672
..
7df040e
100644
(file)
--- a/
arch/arm/configs/cm_x300_defconfig
+++ b/
arch/arm/configs/cm_x300_defconfig
@@
-129,7
+129,6
@@
CONFIG_HID_TOPSEED=y
CONFIG_HID_THRUSTMASTER=y
CONFIG_HID_ZEROPLUS=y
CONFIG_USB=y
-CONFIG_USB_DEVICEFS=y
# CONFIG_USB_DEVICE_CLASS is not set
CONFIG_USB_MON=y
CONFIG_USB_OHCI_HCD=y