v31

diff --git a/kernel-power-2.6.28/debian/changelog b/kernel-power-2.6.28/debian/changelog
index 146e14f..ec52806 100644 (file)
--- a/kernel-power-2.6.28/debian/changelog
+++ b/kernel-power-2.6.28/debian/changelog
@@ -1,3 +1,9 @@
+kernel-power (2.6.28-maemo31) fremantle; urgency=low
+
+  * reverted the remaining changes to v27
+
+ -- Thomas Tanner <maemo@tannerlab.com>  Mon, 17 May 2010 18:27:36 +0200
+
 kernel-power (2.6.28-maemo30) fremantle; urgency=low
 
   * disable OABI too

diff --git a/kernel-power-2.6.28/debian/rx51power_defconfig b/kernel-power-2.6.28/debian/rx51power_defconfig
index 48df755..8e397c3 100644 (file)
--- a/kernel-power-2.6.28/debian/rx51power_defconfig
+++ b/kernel-power-2.6.28/debian/rx51power_defconfig
@@ -615,7 +615,7 @@ CONFIG_NET_SCH_TBF=m
 # CONFIG_NET_SCH_GRED is not set
 CONFIG_NET_SCH_DSMARK=m
 # CONFIG_NET_SCH_NETEM is not set
-CONFIG_NET_SCH_INGRESS=m
+#CONFIG_NET_SCH_INGRESS=m
 
 #
 # Classification
@@ -629,7 +629,7 @@ CONFIG_NET_CLS_U32=m
 # CONFIG_CLS_U32_PERF is not set
 # CONFIG_CLS_U32_MARK is not set
 CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
+#CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_CLS_FLOW=m
 # CONFIG_NET_EMATCH is not set
 CONFIG_NET_CLS_ACT=y