[kernel] r18851 - in dists/sid/linux-2.6/debian: . config/kernelarch-x86

[Ben Hutchings]

Author: benh
Date: Sun Mar 18 03:47:28 2012
New Revision: 18851

Log:
[x86] Enable RTS5139 as module (Closes: #663912)

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/kernelarch-x86/config

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sun Mar 18 02:49:09 2012	(r18850)
+++ dists/sid/linux-2.6/debian/changelog	Sun Mar 18 03:47:28 2012	(r18851)
@@ -1,9 +1,13 @@
 linux-2.6 (3.2.10-2) UNRELEASED; urgency=low
 
+  [ Ben Hutchings ]
   * [powerpc] Enable KVM_GUEST
   * [s390] Ignore arch_pick_mmap_layout version change; it should not be
     needed by modules (fixes FTBFS)
 
+  [ Jonathan Nieder ]
+  * [x86] Enable RTS5139 as module (Closes: #663912)
+
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 17 Mar 2012 23:21:02 +0000
 
 linux-2.6 (3.2.10-1) unstable; urgency=high

Modified: dists/sid/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/kernelarch-x86/config	Sun Mar 18 02:49:09 2012	(r18850)
+++ dists/sid/linux-2.6/debian/config/kernelarch-x86/config	Sun Mar 18 03:47:28 2012	(r18851)
@@ -1333,6 +1333,12 @@
 CONFIG_R8712U=m
 
 ##
+## file: drivers/staging/rts5139/Kconfig
+##
+CONFIG_RTS5139=m
+# CONFIG_RTS5139_DEBUG is not set
+
+##
 ## file: drivers/staging/rts_pstor/Kconfig
 ##
 CONFIG_RTS_PSTOR=m