diff --git a/[refs] b/[refs]
index 46f59e0711b1..48d9d0bf9228 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8c28f2389942bab376e39351d27525499630248
+refs/heads/master: 325a4af60dc945bf2da9cbcdbabb276e312b297c
diff --git a/trunk/drivers/usb/host/isp116x-hcd.c b/trunk/drivers/usb/host/isp116x-hcd.c
index c5e224048efa..14386254c870 100644
--- a/trunk/drivers/usb/host/isp116x-hcd.c
+++ b/trunk/drivers/usb/host/isp116x-hcd.c
@@ -63,7 +63,7 @@
 #include <linux/init.h>
 #include <linux/list.h>
 #include <linux/usb.h>
-#include <linux/usb_isp116x.h>
+#include <linux/usb/isp116x.h>
 #include <linux/platform_device.h>
 
 #include <asm/io.h>
diff --git a/trunk/drivers/usb/host/sl811-hcd.c b/trunk/drivers/usb/host/sl811-hcd.c
index a92343052751..6b4bc3f2bd86 100644
--- a/trunk/drivers/usb/host/sl811-hcd.c
+++ b/trunk/drivers/usb/host/sl811-hcd.c
@@ -46,7 +46,7 @@
 #include <linux/list.h>
 #include <linux/interrupt.h>
 #include <linux/usb.h>
-#include <linux/usb_sl811.h>
+#include <linux/usb/sl811.h>
 #include <linux/platform_device.h>
 
 #include <asm/io.h>
diff --git a/trunk/drivers/usb/host/sl811_cs.c b/trunk/drivers/usb/host/sl811_cs.c
index 302aa1ec312f..54f554e0f0ad 100644
--- a/trunk/drivers/usb/host/sl811_cs.c
+++ b/trunk/drivers/usb/host/sl811_cs.c
@@ -27,7 +27,7 @@
 #include <pcmcia/cisreg.h>
 #include <pcmcia/ds.h>
 
-#include <linux/usb_sl811.h>
+#include <linux/usb/sl811.h>
 
 MODULE_AUTHOR("Botond Botyanszki");
 MODULE_DESCRIPTION("REX-CFU1U PCMCIA driver for 2.6");
diff --git a/trunk/include/linux/usb_isp116x.h b/trunk/include/linux/usb/isp116x.h
similarity index 100%
rename from trunk/include/linux/usb_isp116x.h
rename to trunk/include/linux/usb/isp116x.h
diff --git a/trunk/include/linux/usb_sl811.h b/trunk/include/linux/usb/sl811.h
similarity index 71%
rename from trunk/include/linux/usb_sl811.h
rename to trunk/include/linux/usb/sl811.h
index 4f2d012d7309..397ee3b3d7f3 100644
--- a/trunk/include/linux/usb_sl811.h
+++ b/trunk/include/linux/usb/sl811.h
@@ -14,13 +14,13 @@ struct sl811_platform_data {
 	u8		power;
 
 	/* sl811 relies on an external source of VBUS current */
-	void 		(*port_power)(struct device *dev, int is_on);
+	void		(*port_power)(struct device *dev, int is_on);
 
 	/* pulse sl811 nRST (probably with a GPIO) */
-	void 		(*reset)(struct device *dev);
+	void		(*reset)(struct device *dev);
 
 	// some boards need something like these:
- 	// int 		(*check_overcurrent)(struct device *dev);
- 	// void 	(*clock_enable)(struct device *dev, int is_on);
+	// int		(*check_overcurrent)(struct device *dev);
+	// void		(*clock_enable)(struct device *dev, int is_on);
 };