diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c index c5e224048efa8919cfe3985613c09bf712c6451e..14386254c87029546d84f8858033958134e31580 100644 --- a/drivers/usb/host/isp116x-hcd.c +++ b/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/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c index a92343052751c06b57cd99dbc50ed607e17b5eae..6b4bc3f2bd864fd28b3b135118db929735ecf016 100644 --- a/drivers/usb/host/sl811-hcd.c +++ b/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/drivers/usb/host/sl811_cs.c b/drivers/usb/host/sl811_cs.c index 302aa1ec312f55ef21592dd40c4e164ee12d5322..54f554e0f0ade94f5ed961930629676e8a79c0a5 100644 --- a/drivers/usb/host/sl811_cs.c +++ b/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/include/linux/usb_isp116x.h b/include/linux/usb/isp116x.h similarity index 100% rename from include/linux/usb_isp116x.h rename to include/linux/usb/isp116x.h diff --git a/include/linux/usb_sl811.h b/include/linux/usb/sl811.h similarity index 71% rename from include/linux/usb_sl811.h rename to include/linux/usb/sl811.h index 4f2d012d7309937e4597d6369bb9b67b54c6a24d..397ee3b3d7f357ff5d2d665491c12a28f478d909 100644 --- a/include/linux/usb_sl811.h +++ b/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); };