summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/marzen_defconfig
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2012-10-29 09:15:43 +0100
committerSimon Horman <horms@verge.net.au>2012-11-08 09:52:04 +0100
commitac7c4ea037e376a89a37f4f8f9e315cdff364648 (patch)
treea8c56aab6cec6944221c663282a11b69a5079a7a /arch/arm/configs/marzen_defconfig
parentARM: shmobile: marzen: add USB EHCI driver support (diff)
downloadlinux-ac7c4ea037e376a89a37f4f8f9e315cdff364648.tar.xz
linux-ac7c4ea037e376a89a37f4f8f9e315cdff364648.zip
ARM: shmobile: marzen: add USB OHCI driver support
This patch supports CN21/CN22 USB 1.x (port 0/1/2), and enable input event on defconfig Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'arch/arm/configs/marzen_defconfig')
-rw-r--r--arch/arm/configs/marzen_defconfig5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig
index 6540dfba1c17..728a43c446f8 100644
--- a/arch/arm/configs/marzen_defconfig
+++ b/arch/arm/configs/marzen_defconfig
@@ -61,9 +61,8 @@ CONFIG_SMSC911X=y
# CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_WLAN is not set
# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_KEYBOARD is not set
+CONFIG_INPUT_EVDEV=y
# CONFIG_INPUT_MOUSE is not set
-# CONFIG_SERIO is not set
# CONFIG_VT is not set
# CONFIG_LEGACY_PTYS is not set
# CONFIG_DEVKMEM is not set
@@ -86,6 +85,8 @@ CONFIG_MMC=y
CONFIG_MMC_SDHI=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PLATFORM=y
CONFIG_USB_EHCI_HCD_PLATFORM=y
CONFIG_USB_STORAGE=y
CONFIG_UIO=y