diff -urN oldtree/drivers/media/dvb/dvb-usb/Kconfig newtree/drivers/media/dvb/dvb-usb/Kconfig
--- oldtree/drivers/media/dvb/dvb-usb/Kconfig	2006-10-05 15:36:57.000000000 -0400
+++ newtree/drivers/media/dvb/dvb-usb/Kconfig	2006-10-07 10:00:46.000000000 -0400
@@ -69,7 +69,6 @@
 config DVB_USB_DIB0700
 	tristate "DiBcom DiB0700 USB DVB devices (see help for supported devices)"
 	depends on DVB_USB
-	select DVB_DIB7000M
 	select DVB_DIB3000MC
 	select DVB_TUNER_MT2060
 	help
diff -urN oldtree/include/linux/sched.h newtree/include/linux/sched.h
--- oldtree/include/linux/sched.h	2006-10-07 10:23:07.000000000 -0400
+++ newtree/include/linux/sched.h	2006-10-07 10:02:19.000000000 -0400
@@ -41,6 +41,15 @@
 
 #ifdef __KERNEL__
 
+#ifdef CONFIG_INGOSCHED
+#define SCHED_MAX              SCHED_BATCH
+#endif
+#ifdef CONFIG_STAIRCASE
+#define SCHED_MAX              SCHED_IDLEPRIO
+#endif
+#define SCHED_RT(policy)       ((policy) == SCHED_FIFO || \
+                                        (policy) == SCHED_RR)
+
 struct sched_param {
 	int sched_priority;
 };
diff -urN oldtree/mm/vmscan.c newtree/mm/vmscan.c
--- oldtree/mm/vmscan.c	2006-10-07 10:23:08.000000000 -0400
+++ newtree/mm/vmscan.c	2006-10-07 10:04:29.000000000 -0400
@@ -1096,6 +1096,9 @@
 		.mapped = vm_mapped,
 	};
 
+        if (p)
+                scan_priority = sc_priority(p);
+
 	delay_swap_prefetch();
 	count_vm_event(ALLOCSTALL);
 
@@ -1572,9 +1575,6 @@
 		.mapped = vm_mapped,
 	};
 
-	if (p)
-		scan_priority = sc_priority(p);
-
 	delay_swap_prefetch();
 
 	current->reclaim_state = &reclaim_state;