[patch 2.6.23-rc9] re-remove <linux/usb_sl811.h>

Remove <linux/usb_sl811.h> ... somehow this was recreated when
the Blackfin arch was merged, instead of using <linux/usb/sl811.h>
which is the correct header.

Signed-off-by: David Brownell <[email protected]>
---
 arch/blackfin/mach-bf537/boards/generic_board.c |    2 -
 arch/blackfin/mach-bf537/boards/pnav10.c        |    2 -
 arch/blackfin/mach-bf537/boards/stamp.c         |    2 -
 include/linux/usb_sl811.h                       |   26 ------------------------
 4 files changed, 3 insertions(+), 29 deletions(-)

--- g26.orig/include/linux/usb_sl811.h	2007-10-04 17:06:54.000000000 -0700
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-
-/*
- * board initialization should put one of these into dev->platform_data
- * and place the sl811hs onto platform_bus named "sl811-hcd".
- */
-
-struct sl811_platform_data {
-	unsigned	can_wakeup:1;
-
-	/* given port_power, msec/2 after power on till power good */
-	u8		potpg;
-
-	/* mA/2 power supplied on this port (max = default = 250) */
-	u8		power;
-
-	/* sl811 relies on an external source of VBUS current */
-	void 		(*port_power)(struct device *dev, int is_on);
-
-	/* pulse sl811 nRST (probably with a GPIO) */
-	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);
-};
-
--- g26.orig/arch/blackfin/mach-bf537/boards/generic_board.c	2007-10-04 17:09:44.000000000 -0700
+++ g26/arch/blackfin/mach-bf537/boards/generic_board.c	2007-10-04 17:09:58.000000000 -0700
@@ -36,7 +36,7 @@
 #include <linux/spi/flash.h>
 #include <linux/usb_isp1362.h>
 #include <linux/irq.h>
-#include <linux/usb_sl811.h>
+#include <linux/usb/sl811.h>
 #include <asm/bfin5xx_spi.h>
 
 /*
--- g26.orig/arch/blackfin/mach-bf537/boards/pnav10.c	2007-10-04 17:09:44.000000000 -0700
+++ g26/arch/blackfin/mach-bf537/boards/pnav10.c	2007-10-04 17:09:54.000000000 -0700
@@ -39,7 +39,7 @@
 #endif
 #include <linux/irq.h>
 #include <asm/bfin5xx_spi.h>
-#include <linux/usb_sl811.h>
+#include <linux/usb/sl811.h>
 
 #include <linux/spi/ad7877.h>
 
--- g26.orig/arch/blackfin/mach-bf537/boards/stamp.c	2007-10-04 17:09:44.000000000 -0700
+++ g26/arch/blackfin/mach-bf537/boards/stamp.c	2007-10-04 17:10:10.000000000 -0700
@@ -39,7 +39,7 @@
 #endif
 #include <linux/irq.h>
 #include <linux/interrupt.h>
-#include <linux/usb_sl811.h>
+#include <linux/usb/sl811.h>
 #include <asm/bfin5xx_spi.h>
 #include <linux/spi/ad7877.h>
 

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
[email protected]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel