Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=27f5d75afaa1b65e4cc1e4ac8a2a5095d24f1576
Commit:     27f5d75afaa1b65e4cc1e4ac8a2a5095d24f1576
Parent:     9454a57ab5922e5cd25321cae9d1a8cbeb3e2e85
Author:     David Brownell <[EMAIL PROTECTED]>
AuthorDate: Thu Oct 4 18:06:16 2007 -0700
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Fri Oct 12 14:55:31 2007 -0700

    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: David Brownell <[EMAIL PROTECTED]>
    Signed-off-by: Greg Kroah-Hartman <[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(-)

diff --git a/arch/blackfin/mach-bf537/boards/generic_board.c 
b/arch/blackfin/mach-bf537/boards/generic_board.c
index 5e9d09e..6668c8e 100644
--- a/arch/blackfin/mach-bf537/boards/generic_board.c
+++ b/arch/blackfin/mach-bf537/boards/generic_board.c
@@ -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>
diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c 
b/arch/blackfin/mach-bf537/boards/pnav10.c
index 20507e9..f83a254 100644
--- a/arch/blackfin/mach-bf537/boards/pnav10.c
+++ b/arch/blackfin/mach-bf537/boards/pnav10.c
@@ -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>
 
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c 
b/arch/blackfin/mach-bf537/boards/stamp.c
index 47d7d4a..f42ba3a 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -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>
diff --git a/include/linux/usb_sl811.h b/include/linux/usb_sl811.h
deleted file mode 100644
index 4f2d012..0000000
--- a/include/linux/usb_sl811.h
+++ /dev/null
@@ -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);
-};
-
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to