From 0b6dc8c4e7833e7ed50ffd73f455a0959b72287e Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Sun, 2 Jun 2013 20:39:18 +0000
Subject: [PATCH] Enable various new drivers and driver features; add to
 appropriate udebs

svn path=/dists/trunk/linux/; revision=20179
---
 debian/changelog                              |  6 ++++++
 debian/config/config                          | 11 +++++++++++
 debian/installer/modules/nic-usb-modules      |  1 +
 debian/installer/modules/nic-wireless-modules |  1 +
 4 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 180f9d368..2011f0910 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,12 @@ linux (3.10~rc4-1~experimental.1.dsc) UNRELEASED; urgency=low
 
   [ Ben Hutchings ]
   * aufs: Update to aufs3.x-rcN-20130520
+  * md: Enable BCACHE as module
+  * net/usb: Enable USB_RTL8152 as module
+    - udeb: Add r8152 to nic-usb-modules
+  * rt2800usb: Enable RT2800USB_RT55XX
+  * net/wireless: Enable RTL8188EE
+    - udeb: Add rtl8188ee to nic-wireless-modules
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sun, 02 Jun 2013 17:46:32 +0100
 
diff --git a/debian/config/config b/debian/config/config
index 7726a4ba9..bcb012ae8 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -989,6 +989,14 @@ CONFIG_DM_UEVENT=y
 CONFIG_DM_FLAKEY=m
 CONFIG_DM_VERITY=m
 
+##
+## file: drivers/md/bcache/Kconfig
+##
+CONFIG_BCACHE=m
+# CONFIG_BCACHE_DEBUG is not set
+# CONFIG_BCACHE_EDEBUG is not set
+# CONFIG_BCACHE_CLOSURES_DEBUG is not set
+
 ##
 ## file: drivers/media/Kconfig
 ##
@@ -2297,6 +2305,7 @@ CONFIG_USB_CATC=m
 CONFIG_USB_KAWETH=m
 CONFIG_USB_PEGASUS=m
 CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_AX88179_178A=m
@@ -2530,6 +2539,7 @@ CONFIG_RT2800USB=m
 CONFIG_RT2800USB_RT33XX=y
 CONFIG_RT2800USB_RT35XX=y
 CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
 # CONFIG_RT2800USB_UNKNOWN is not set
 # CONFIG_RT2X00_DEBUG is not set
 
@@ -2547,6 +2557,7 @@ CONFIG_RTL8192CE=m
 CONFIG_RTL8192SE=m
 CONFIG_RTL8192DE=m
 CONFIG_RTL8723AE=m
+CONFIG_RTL8188EE=m
 CONFIG_RTL8192CU=m
 # CONFIG_RTLWIFI_DEBUG is not set
 
diff --git a/debian/installer/modules/nic-usb-modules b/debian/installer/modules/nic-usb-modules
index 59574222b..363f32fa0 100644
--- a/debian/installer/modules/nic-usb-modules
+++ b/debian/installer/modules/nic-usb-modules
@@ -9,6 +9,7 @@ int51x1 ?
 kaweth
 mcs7830 ?
 pegasus
+r8152 ?
 rndis_wlan ?
 rtl8150
 rtl8187 ?
diff --git a/debian/installer/modules/nic-wireless-modules b/debian/installer/modules/nic-wireless-modules
index 4c2ba5cc0..e35604287 100644
--- a/debian/installer/modules/nic-wireless-modules
+++ b/debian/installer/modules/nic-wireless-modules
@@ -41,6 +41,7 @@ rt2800usb ?
 rt61pci ?
 rt73usb ?
 rtl8180 ?
+rtl8188ee ?
 rtl8192ce ?
 rtl8192cu ?
 rtl8192de ?