diff options
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/marzen_defconfig | 5 |
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 | |||
61 | # CONFIG_NET_VENDOR_STMICRO is not set | 61 | # CONFIG_NET_VENDOR_STMICRO is not set |
62 | # CONFIG_WLAN is not set | 62 | # CONFIG_WLAN is not set |
63 | # CONFIG_INPUT_MOUSEDEV is not set | 63 | # CONFIG_INPUT_MOUSEDEV is not set |
64 | # CONFIG_INPUT_KEYBOARD is not set | 64 | CONFIG_INPUT_EVDEV=y |
65 | # CONFIG_INPUT_MOUSE is not set | 65 | # CONFIG_INPUT_MOUSE is not set |
66 | # CONFIG_SERIO is not set | ||
67 | # CONFIG_VT is not set | 66 | # CONFIG_VT is not set |
68 | # CONFIG_LEGACY_PTYS is not set | 67 | # CONFIG_LEGACY_PTYS is not set |
69 | # CONFIG_DEVKMEM is not set | 68 | # CONFIG_DEVKMEM is not set |
@@ -86,6 +85,8 @@ CONFIG_MMC=y | |||
86 | CONFIG_MMC_SDHI=y | 85 | CONFIG_MMC_SDHI=y |
87 | CONFIG_USB=y | 86 | CONFIG_USB=y |
88 | CONFIG_USB_EHCI_HCD=y | 87 | CONFIG_USB_EHCI_HCD=y |
88 | CONFIG_USB_OHCI_HCD=y | ||
89 | CONFIG_USB_OHCI_HCD_PLATFORM=y | ||
89 | CONFIG_USB_EHCI_HCD_PLATFORM=y | 90 | CONFIG_USB_EHCI_HCD_PLATFORM=y |
90 | CONFIG_USB_STORAGE=y | 91 | CONFIG_USB_STORAGE=y |
91 | CONFIG_UIO=y | 92 | CONFIG_UIO=y |