Commit 27f5d75a authored by David Brownell's avatar David Brownell Committed by Greg Kroah-Hartman
Browse files

USB: 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: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9454a57a

arch/blackfin/mach-bf537/boards/generic_board.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
#include <linux/pata_platform.h>

#include <linux/irq.h>

#include <linux/interrupt.h>

#include <linux/usb_sl811.h>

#include <linux/usb/sl811.h>

#include <asm/dma.h>

#include <asm/bfin5xx_spi.h>

#include <asm/reboot.h>

arch/blackfin/mach-bf537/boards/pnav10.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
#include <linux/irq.h>

#include <asm/dma.h>

#include <asm/bfin5xx_spi.h>

#include <linux/usb_sl811.h>

#include <linux/usb/sl811.h>



#include <linux/spi/ad7877.h>

arch/blackfin/mach-bf537/boards/stamp.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
#include <linux/pata_platform.h>

#include <linux/irq.h>

#include <linux/interrupt.h>

#include <linux/usb_sl811.h>

#include <linux/usb/sl811.h>

#include <asm/dma.h>

#include <asm/bfin5xx_spi.h>

#include <asm/reboot.h>

include/linux/usb_sl811.h

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 


/*

 * 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);

};