From 325a4af60dc945bf2da9cbcdbabb276e312b297c Mon Sep 17 00:00:00 2001
From: David Brownell <david-b@pacbell.net>
Date: Tue, 13 Jun 2006 09:59:32 -0700
Subject: [PATCH] [PATCH] USB: move hardware-specific <linux/usb_*.h> to
 <linux/usb/*.h>

This moves header files for controller-specific platform data
from <linux/usb_XXX.h> to <linux/usb/XXX.h> to start reducing
some clutter.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 drivers/usb/host/isp116x-hcd.c                 | 2 +-
 drivers/usb/host/sl811-hcd.c                   | 2 +-
 drivers/usb/host/sl811_cs.c                    | 2 +-
 include/linux/{usb_isp116x.h => usb/isp116x.h} | 0
 include/linux/{usb_sl811.h => usb/sl811.h}     | 8 ++++----
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename include/linux/{usb_isp116x.h => usb/isp116x.h} (100%)
 rename include/linux/{usb_sl811.h => usb/sl811.h} (71%)

diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c
index c5e224048ef..14386254c87 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 a9234305275..6b4bc3f2bd8 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 302aa1ec312..54f554e0f0a 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 4f2d012d730..397ee3b3d7f 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);
 };
 
-- 
2.20.1