Commit 7fa4eb86 authored by Mauro Ribeiro's avatar Mauro Ribeiro

Merge branch 'odroidxu3-3.10.y' of github.com:hardkernel/linux into odroidxu3-3.10.y

parents c2e1cd80 f67ebd4a
...@@ -1313,7 +1313,7 @@ CONFIG_SCSI_MOD=y ...@@ -1313,7 +1313,7 @@ CONFIG_SCSI_MOD=y
CONFIG_SCSI=y CONFIG_SCSI=y
CONFIG_SCSI_DMA=y CONFIG_SCSI_DMA=y
# CONFIG_SCSI_TGT is not set # CONFIG_SCSI_TGT is not set
# CONFIG_SCSI_NETLINK is not set CONFIG_SCSI_NETLINK=y
CONFIG_SCSI_PROC_FS=y CONFIG_SCSI_PROC_FS=y
# #
...@@ -1335,7 +1335,7 @@ CONFIG_SCSI_MULTI_LUN=y ...@@ -1335,7 +1335,7 @@ CONFIG_SCSI_MULTI_LUN=y
# SCSI Transports # SCSI Transports
# #
# CONFIG_SCSI_SPI_ATTRS is not set # CONFIG_SCSI_SPI_ATTRS is not set
# CONFIG_SCSI_FC_ATTRS is not set CONFIG_SCSI_FC_ATTRS=m
CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m
# CONFIG_SCSI_SAS_ATTRS is not set # CONFIG_SCSI_SAS_ATTRS is not set
# CONFIG_SCSI_SAS_LIBSAS is not set # CONFIG_SCSI_SAS_LIBSAS is not set
...@@ -1344,8 +1344,9 @@ CONFIG_SCSI_LOWLEVEL=y ...@@ -1344,8 +1344,9 @@ CONFIG_SCSI_LOWLEVEL=y
CONFIG_ISCSI_TCP=m CONFIG_ISCSI_TCP=m
CONFIG_ISCSI_BOOT_SYSFS=m CONFIG_ISCSI_BOOT_SYSFS=m
# CONFIG_SCSI_UFSHCD is not set # CONFIG_SCSI_UFSHCD is not set
# CONFIG_LIBFC is not set CONFIG_LIBFC=m
# CONFIG_LIBFCOE is not set CONFIG_LIBFCOE=m
CONFIG_FCOE=m
# CONFIG_SCSI_DEBUG is not set # CONFIG_SCSI_DEBUG is not set
# CONFIG_SCSI_DH is not set # CONFIG_SCSI_DH is not set
# CONFIG_SCSI_OSD_INITIATOR is not set # CONFIG_SCSI_OSD_INITIATOR is not set
...@@ -1382,7 +1383,13 @@ CONFIG_DM_RAID=m ...@@ -1382,7 +1383,13 @@ CONFIG_DM_RAID=m
# CONFIG_DM_UEVENT is not set # CONFIG_DM_UEVENT is not set
# CONFIG_DM_FLAKEY is not set # CONFIG_DM_FLAKEY is not set
CONFIG_DM_VERITY=m CONFIG_DM_VERITY=m
# CONFIG_TARGET_CORE is not set CONFIG_TARGET_CORE=m
CONFIG_TCM_IBLOCK=m
CONFIG_TCM_FILEIO=m
CONFIG_TCM_PSCSI=m
CONFIG_LOOPBACK_TARGET=m
CONFIG_TCM_FC=m
CONFIG_ISCSI_TARGET=m
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_NET_CORE=y CONFIG_NET_CORE=y
CONFIG_BONDING=m CONFIG_BONDING=m
...@@ -3152,6 +3159,7 @@ CONFIG_USB_FUNCTIONFS_ETH=y ...@@ -3152,6 +3159,7 @@ CONFIG_USB_FUNCTIONFS_ETH=y
CONFIG_USB_FUNCTIONFS_RNDIS=y CONFIG_USB_FUNCTIONFS_RNDIS=y
CONFIG_USB_FUNCTIONFS_GENERIC=y CONFIG_USB_FUNCTIONFS_GENERIC=y
CONFIG_USB_MASS_STORAGE=m CONFIG_USB_MASS_STORAGE=m
# CONFIG_USB_GADGET_TARGET is not set
CONFIG_USB_G_SERIAL=m CONFIG_USB_G_SERIAL=m
CONFIG_USB_MIDI_GADGET=m CONFIG_USB_MIDI_GADGET=m
CONFIG_USB_G_PRINTER=m CONFIG_USB_G_PRINTER=m
......
...@@ -670,7 +670,6 @@ config LIBFCOE ...@@ -670,7 +670,6 @@ config LIBFCOE
config FCOE config FCOE
tristate "FCoE module" tristate "FCoE module"
depends on PCI
select LIBFCOE select LIBFCOE
---help--- ---help---
Fibre Channel over Ethernet module Fibre Channel over Ethernet module
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment