--- trunk/core/kernel26-magellan-server/kernel26-magellan-server-2.6.25-r5.smage2	2008/10/10 19:15:16	15
+++ trunk/core/kernel26-magellan-server/kernel26-magellan-server-2.6.25-r5.smage2	2008/10/10 19:16:50	16
@@ -1,7 +1,7 @@
-# $Header: /magellan-cvs/smage/kernel26-magellan-server/kernel26-magellan-server-2.6.25-r4.smage2,v 1.1 2008/07/31 14:27:05 niro Exp $
+# $Header: /magellan-cvs/smage/kernel26-magellan-server/kernel26-magellan-server-2.6.25-r5.smage2,v 1.1 2008/10/07 09:42:57 niro Exp $
 
 # standard magellan kernel:
-#	using linux-2.6.25.15
+#	using linux-2.6.25.17
 #	using fbcondecor-0.9.4 (fbsplash)
 #	using squashfs-3.3
 #		-> updated to a version which works with 2.6.25
@@ -20,6 +20,7 @@
 #	added some fixes for powertop (http://www.lesswatts.org/projects/powertop/)
 #	use modular ide-framework to fix udma issues with nforce boards
 #	added atl2 ethernet driver (http://people.redhat.com/csnook/atl2/; http://atl2.sourceforge.net/)
+#	dropped some fb drivers (FB_S3, FB_VT8623, FB_ARK) to disable the FB_TILEBLITTING symbol to enable FB_CON_DECOR
 
 # what type are we building (sources or image) ?
 KERNEL_TYPE="image"
@@ -87,6 +88,8 @@
 	"mirror://kernel26-${BRANCH}/patches-${PVER}-${PBUILD}/0112-2.6.25.13-all-fixes.patch patches-${PVER}-${PBUILD}"
 	"mirror://kernel26-${BRANCH}/patches-${PVER}-${PBUILD}/0113-2.6.25.14-all-fixes.patch patches-${PVER}-${PBUILD}"
 	"mirror://kernel26-${BRANCH}/patches-${PVER}-${PBUILD}/0114-2.6.25.15-all-fixes.patch patches-${PVER}-${PBUILD}"
+	"mirror://kernel26-${BRANCH}/patches-${PVER}-${PBUILD}/0115-2.6.25.16-all-fixes.patch patches-${PVER}-${PBUILD}"
+	"mirror://kernel26-${BRANCH}/patches-${PVER}-${PBUILD}/0116-2.6.25.17-all-fixes.patch patches-${PVER}-${PBUILD}"
 	"mirror://kernel26-${BRANCH}/patches-${PVER}-${PBUILD}/0150-2.6.25-fbcondecor-0.9.4.patch patches-${PVER}-${PBUILD}"
 	"mirror://kernel26-${BRANCH}/patches-${PVER}-${PBUILD}/0152-2.6.25-squashfs-3.3-2.patch patches-${PVER}-${PBUILD}"
 	"mirror://kernel26-${BRANCH}/patches-${PVER}-${PBUILD}/0153-2.6.25-unionfs-2.3.3.patch patches-${PVER}-${PBUILD}"
@@ -121,6 +124,8 @@
 	mpatch patches-${PVER}-${PBUILD}/0112-2.6.25.13-all-fixes.patch || die
 	mpatch patches-${PVER}-${PBUILD}/0113-2.6.25.14-all-fixes.patch || die
 	mpatch patches-${PVER}-${PBUILD}/0114-2.6.25.15-all-fixes.patch || die
+	mpatch patches-${PVER}-${PBUILD}/0115-2.6.25.16-all-fixes.patch || die
+	mpatch patches-${PVER}-${PBUILD}/0116-2.6.25.17-all-fixes.patch || die
 	# 150-300 - magellan patches, driver updates etc
 	mpatch patches-${PVER}-${PBUILD}/0150-2.6.25-fbcondecor-0.9.4.patch || die
 	mpatch patches-${PVER}-${PBUILD}/0152-2.6.25-squashfs-3.3-2.patch || die