Index: linux-2.6.19-rc6-mm2/drivers/usb/storage/transport.c
===================================================================
--- linux-2.6.19-rc6-mm2.orig/drivers/usb/storage/transport.c	2006-11-15 20:03:40.000000000 -0800
+++ linux-2.6.19-rc6-mm2/drivers/usb/storage/transport.c	2006-11-29 18:55:15.000000000 -0800
@@ -427,7 +427,7 @@
 	US_DEBUGP("%s: xfer %u bytes, %d entries\n", __FUNCTION__,
 			length, num_sg);
 	result = usb_sg_init(&us->current_sg, us->pusb_dev, pipe, 0,
-			sg, num_sg, length, SLAB_NOIO);
+			sg, num_sg, length, GFP_NOIO);
 	if (result) {
 		US_DEBUGP("usb_sg_init returned %d\n", result);
 		return USB_STOR_XFER_ERROR;
Index: linux-2.6.19-rc6-mm2/include/linux/slab.h
===================================================================
--- linux-2.6.19-rc6-mm2.orig/include/linux/slab.h	2006-11-29 18:55:10.000000000 -0800
+++ linux-2.6.19-rc6-mm2/include/linux/slab.h	2006-11-29 18:55:15.000000000 -0800
@@ -20,7 +20,6 @@
 
 /* flags for kmem_cache_alloc() */
 #define	SLAB_NOFS		GFP_NOFS
-#define	SLAB_NOIO		GFP_NOIO
 #define	SLAB_ATOMIC		GFP_ATOMIC
 #define	SLAB_USER		GFP_USER
 #define	SLAB_KERNEL		GFP_KERNEL