aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <benh@debian.org>2011-08-15 14:15:59 +0000
committerBen Hutchings <benh@debian.org>2011-08-15 14:15:59 +0000
commit0876620cb76df7fd416d1a27ad2e6b9a89939664 (patch)
tree76274c758d3fcb1c6684fb726b5037f3c67c0f06
parentfb26bc926dd469dab4b60160a83a904cb4731589 (diff)
downloadkernel_replicant_linux-0876620cb76df7fd416d1a27ad2e6b9a89939664.tar.gz
kernel_replicant_linux-0876620cb76df7fd416d1a27ad2e6b9a89939664.tar.bz2
kernel_replicant_linux-0876620cb76df7fd416d1a27ad2e6b9a89939664.zip
[x86] Enable RTS_PSTOR as module
svn path=/dists/sid/linux-2.6/; revision=17932
-rw-r--r--debian/changelog1
-rw-r--r--debian/config/kernelarch-x86/config6
2 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 16771d5b015f..80e979325542 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ linux-2.6 (3.0.0-2) UNRELEASED; urgency=low
= expect uid
- ecryptfs: Return error when lower file pointer is NULL
- ext{3,4}: Properly count journal credits for long symlinks
+ * [x86] Enable RTS_PSTOR as module
[ maximilian attems ]
* Add stable 3.0.1, including:
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index f46889d843a4..29a7be993f0f 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -1231,6 +1231,12 @@ CONFIG_RTL8192U=m
CONFIG_R8712U=m
##
+## file: drivers/staging/rts_pstor/Kconfig
+##
+CONFIG_RTS_PSTOR=m
+# RTS_PSTOR_DEBUG is not set
+
+##
## file: drivers/staging/tm6000/Kconfig
##
CONFIG_VIDEO_TM6000=m