diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-07 14:58:41 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-07 14:58:41 +1100 |
| commit | 2a0fe18aafba146f553854dddbb7647e2cf757ad (patch) | |
| tree | f9247cf4ce6280b2b74a4318aacbb55dd43d68d2 /fs/cifs | |
| parent | 097c7b8279991d51b0a9ad6c70cd4522e3b02b09 (diff) | |
| parent | 807be03cae191cb88e2f267adcd49aba785c658b (diff) | |
Merge remote-tracking branch 'driver-core/driver-core-next'
Conflicts:
drivers/dma/dw_dmac.c
drivers/i2c/busses/i2c-s3c2410.c
drivers/iommu/tegra-smmu.c
drivers/net/ethernet/8390/Kconfig
drivers/net/ethernet/fujitsu/Kconfig
drivers/net/ethernet/i825xx/Kconfig
drivers/net/ethernet/intel/Kconfig
drivers/net/ethernet/racal/Kconfig
drivers/net/ethernet/seeq/Kconfig
drivers/net/wan/Kconfig
drivers/spi/Kconfig
drivers/spi/spi-s3c64xx.c
net/wanrouter/Kconfig
Diffstat (limited to 'fs/cifs')
| -rw-r--r-- | fs/cifs/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/cifs/Kconfig b/fs/cifs/Kconfig index 21ff76c22a17..2906ee276408 100644 --- a/fs/cifs/Kconfig +++ b/fs/cifs/Kconfig @@ -155,14 +155,14 @@ config CIFS_DFS_UPCALL points. If unsure, say N. config CIFS_NFSD_EXPORT - bool "Allow nfsd to export CIFS file system (EXPERIMENTAL)" - depends on CIFS && EXPERIMENTAL && BROKEN + bool "Allow nfsd to export CIFS file system" + depends on CIFS && BROKEN help Allows NFS server to export a CIFS mounted share (nfsd over cifs) config CIFS_SMB2 - bool "SMB2 network file system support (EXPERIMENTAL)" - depends on CIFS && EXPERIMENTAL && INET + bool "SMB2 network file system support" + depends on CIFS && INET select NLS select KEYS select FSCACHE |