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

[Ben Hutchings]

Author: benh
Date: Fri Sep 12 06:11:17 2014
New Revision: 21816

Log:
[!x86] staging: Enable R8712U as module (Closes: #742055)

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

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Fri Sep 12 06:04:36 2014	(r21815)
+++ dists/sid/linux/debian/changelog	Fri Sep 12 06:11:17 2014	(r21816)
@@ -53,7 +53,7 @@
   * [i386] comedi: Enable COMEDI_AMPLC_DIO200_ISA, COMEDI_AMPLC_PC236_ISA,
     COMEDI_AMPLC_PC263_ISA, COMEDI_DAS08_ISA, COMEDI_NI_LABPC_ISA as modules
   * [i386] speakup: Enable SPEAKUP_SYNTH_DECPC as module
-  * [!x86] staging: Enable R8188EU as module (Closes: #760859)
+  * [!x86] staging: Enable R8712U, R8188EU as modules (Closes: #742055, #760859)
 
   [ Ian Campbell ]
   * [armel/orion5x] udeb: Include mvmdio in nic-modules udeb.

Modified: dists/sid/linux/debian/config/config
==============================================================================
--- dists/sid/linux/debian/config/config	Fri Sep 12 06:04:36 2014	(r21815)
+++ dists/sid/linux/debian/config/config	Fri Sep 12 06:11:17 2014	(r21816)
@@ -3766,7 +3766,7 @@
 ##
 ## file: drivers/staging/rtl8712/Kconfig
 ##
-# CONFIG_R8712U is not set
+CONFIG_R8712U=m
 
 ##
 ## file: drivers/staging/rtl8723au/Kconfig

Modified: dists/sid/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/sid/linux/debian/config/kernelarch-x86/config	Fri Sep 12 06:04:36 2014	(r21815)
+++ dists/sid/linux/debian/config/kernelarch-x86/config	Fri Sep 12 06:11:17 2014	(r21816)
@@ -1516,11 +1516,6 @@
 CONFIG_RTL8192U=m
 
 ##
-## file: drivers/staging/rtl8712/Kconfig
-##
-CONFIG_R8712U=m
-
-##
 ## file: drivers/staging/rtl8723au/Kconfig
 ##
 CONFIG_R8723AU=m