[x86] staging: lustre: Make LUSTRE_LLITE_LLOOP tristate

svn path=/dists/trunk/linux/; revision=20932
This commit is contained in:
Ben Hutchings 2013-12-29 22:30:20 +00:00
parent 0363adb1e1
commit af18327884
3 changed files with 27 additions and 0 deletions

1
debian/changelog vendored
View File

@ -5,6 +5,7 @@ linux (3.13~rc4-1~exp1) UNRELEASED; urgency=low
[ Ben Hutchings ]
* [rt] Disable until it is updated for 3.13 or later
* aufs: Update to aufs3.x-rcN-20131223
* [x86] staging: lustre: Make LUSTRE_LLITE_LLOOP tristate
[ Aurelien Jarno ]
* [mipsel] Remove r5k-cobalt flavour.

View File

@ -0,0 +1,25 @@
From: Ben Hutchings <ben@decadent.org.uk>
Date: Sun, 29 Dec 2013 23:20:30 +0100
Subject: staging: lustre: Make LUSTRE_LLITE_LLOOP tristate
Forwarded: http://mid.gmane.org/1388356095.2900.34.camel@deadeye.wl.decadent.org.uk
There seems to be no reason why it can't be a module; in fact that is
currently supposed to be the default.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
drivers/staging/lustre/lustre/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/lustre/lustre/Kconfig b/drivers/staging/lustre/lustre/Kconfig
index 2156a44..faa01fa 100644
--- a/drivers/staging/lustre/lustre/Kconfig
+++ b/drivers/staging/lustre/lustre/Kconfig
@@ -55,6 +55,6 @@ config LUSTRE_TRANSLATE_ERRNOS
default y
config LUSTRE_LLITE_LLOOP
- bool "Lustre virtual block device"
+ tristate "Lustre virtual block device"
depends on LUSTRE_FS && BLOCK
default m

View File

@ -76,3 +76,4 @@ debian/add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by-default.patch
bugfix/arm/ahci-imx-Explicitly-clear-IMX6Q_GPR13_SATA_MPLL_CLK_.patch
bugfix/all/disable-some-marvell-phys.patch
features/all/media-az6007-support-Technisat-Cablestar-Combo-HDCI-.patch
bugfix/all/staging-lustre-Make-LUSTRE_LLITE_LLOOP-tristate.patch