diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-20 00:05:38 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-20 00:05:38 +0400 |
| commit | a7204d72db251784808b0c050220992d7f833a2c (patch) | |
| tree | 3491452ea74b039f3278fd95bb7ad7c88b6b3631 /arch/arm64/configs/defconfig | |
| parent | ba6857b2d49646f2d4c245ff58d95d145f380177 (diff) | |
| parent | 31d141e3a666269a3b6fcccddb0351caf7454240 (diff) | |
| download | linux-a7204d72db251784808b0c050220992d7f833a2c.tar.xz | |
Merge 3.12-rc6 into driver-core-next
We want these fixes here too.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm64/configs/defconfig')
| -rw-r--r-- | arch/arm64/configs/defconfig | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 5b3e83217b03..31c81e9b792e 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -42,7 +42,7 @@ CONFIG_IP_PNP_BOOTP=y # CONFIG_WIRELESS is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_DEVTMPFS=y -# CONFIG_BLK_DEV is not set +CONFIG_BLK_DEV=y CONFIG_SCSI=y # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y @@ -72,6 +72,7 @@ CONFIG_LOGO=y # CONFIG_IOMMU_SUPPORT is not set CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y +CONFIG_EXT4_FS=y # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set # CONFIG_EXT3_FS_XATTR is not set CONFIG_FUSE_FS=y @@ -90,3 +91,5 @@ CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_INFO=y # CONFIG_FTRACE is not set CONFIG_ATOMIC64_SELFTEST=y +CONFIG_VIRTIO_MMIO=y +CONFIG_VIRTIO_BLK=y |