diff options
Diffstat (limited to 'arch/arm/configs/marzen_defconfig')
-rw-r--r-- | arch/arm/configs/marzen_defconfig | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig index 5b8215f424c5..728a43c446f8 100644 --- a/arch/arm/configs/marzen_defconfig +++ b/arch/arm/configs/marzen_defconfig | |||
@@ -47,6 +47,8 @@ CONFIG_DEVTMPFS_MOUNT=y | |||
47 | # CONFIG_STANDALONE is not set | 47 | # CONFIG_STANDALONE is not set |
48 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set | 48 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set |
49 | # CONFIG_FW_LOADER is not set | 49 | # CONFIG_FW_LOADER is not set |
50 | CONFIG_SCSI=y | ||
51 | CONFIG_BLK_DEV_SD=y | ||
50 | CONFIG_NETDEVICES=y | 52 | CONFIG_NETDEVICES=y |
51 | # CONFIG_NET_VENDOR_BROADCOM is not set | 53 | # CONFIG_NET_VENDOR_BROADCOM is not set |
52 | # CONFIG_NET_VENDOR_FARADAY is not set | 54 | # CONFIG_NET_VENDOR_FARADAY is not set |
@@ -59,9 +61,8 @@ CONFIG_SMSC911X=y | |||
59 | # CONFIG_NET_VENDOR_STMICRO is not set | 61 | # CONFIG_NET_VENDOR_STMICRO is not set |
60 | # CONFIG_WLAN is not set | 62 | # CONFIG_WLAN is not set |
61 | # CONFIG_INPUT_MOUSEDEV is not set | 63 | # CONFIG_INPUT_MOUSEDEV is not set |
62 | # CONFIG_INPUT_KEYBOARD is not set | 64 | CONFIG_INPUT_EVDEV=y |
63 | # CONFIG_INPUT_MOUSE is not set | 65 | # CONFIG_INPUT_MOUSE is not set |
64 | # CONFIG_SERIO is not set | ||
65 | # CONFIG_VT is not set | 66 | # CONFIG_VT is not set |
66 | # CONFIG_LEGACY_PTYS is not set | 67 | # CONFIG_LEGACY_PTYS is not set |
67 | # CONFIG_DEVKMEM is not set | 68 | # CONFIG_DEVKMEM is not set |
@@ -78,9 +79,16 @@ CONFIG_GPIO_SYSFS=y | |||
78 | CONFIG_THERMAL=y | 79 | CONFIG_THERMAL=y |
79 | CONFIG_RCAR_THERMAL=y | 80 | CONFIG_RCAR_THERMAL=y |
80 | CONFIG_SSB=y | 81 | CONFIG_SSB=y |
81 | # CONFIG_USB_SUPPORT is not set | 82 | CONFIG_USB=y |
83 | CONFIG_USB_RCAR_PHY=y | ||
82 | CONFIG_MMC=y | 84 | CONFIG_MMC=y |
83 | CONFIG_MMC_SDHI=y | 85 | CONFIG_MMC_SDHI=y |
86 | CONFIG_USB=y | ||
87 | CONFIG_USB_EHCI_HCD=y | ||
88 | CONFIG_USB_OHCI_HCD=y | ||
89 | CONFIG_USB_OHCI_HCD_PLATFORM=y | ||
90 | CONFIG_USB_EHCI_HCD_PLATFORM=y | ||
91 | CONFIG_USB_STORAGE=y | ||
84 | CONFIG_UIO=y | 92 | CONFIG_UIO=y |
85 | CONFIG_UIO_PDRV_GENIRQ=y | 93 | CONFIG_UIO_PDRV_GENIRQ=y |
86 | # CONFIG_IOMMU_SUPPORT is not set | 94 | # CONFIG_IOMMU_SUPPORT is not set |