diff --git a/config-generic b/config-generic
index 9d8082cd9..dcb05a761 100644
--- a/config-generic
+++ b/config-generic
@@ -4187,9 +4187,9 @@ CONFIG_OPTIMIZE_INLINING=y
 # CONFIG_PINCTRL is not set
 
 CONFIG_NET_DSA=y
-CONFIG_NET_DSA_MV88E6060=y
-CONFIG_NET_DSA_MV88E6131=y
-CONFIG_NET_DSA_MV88E6123_61_65=y
+CONFIG_NET_DSA_MV88E6060=m
+CONFIG_NET_DSA_MV88E6131=m
+CONFIG_NET_DSA_MV88E6123_61_65=m
 
 # Used by Maemo, we don't care.
 # CONFIG_PHONET is not set
diff --git a/kernel.spec b/kernel.spec
index 273631fe8..fa1a4e3f6 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2285,6 +2285,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Tue Jan 31 2012 Dave Jones <davej@redhat.com>
+- Distributed switch architecture drivers can be modular in 3.3.
+
 * Mon Jan 30 2012 Josh Boyer <jwboyer@redhat.com> - 3.3.0-0.rc1.git6.1
 - Linux 3.3-rc1-git6 (upstream 6bc2b95ee602659c1be6fac0f6aadeb0c5c29a5d)
 - Add patch from Kay Sievers for udlfb device removal