Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / include / linux / usb_isp116x.h

diff --git a/include/linux/usb_isp116x.h b/include/linux/usb_isp116x.h
index 0d21407ccfc2657bf59df44c9f4dd8f210cf4c71..436dd8a2b64ac67bea6d8d183be800a97c9ddc57 100644 (file)
--- a/include/linux/usb_isp116x.h
+++ b/include/linux/usb_isp116x.h
@@ -7,7 +7,7 @@
 struct isp116x_platform_data {
        /* Enable internal resistors on downstream ports */
        unsigned sel15Kres:1;
-       /* On-chip overcurrent protection */
+       /* On-chip overcurrent detection */
        unsigned oc_enable:1;
        /* INT output polarity */
        unsigned int_act_high:1;
@@ -19,20 +19,6 @@ struct isp116x_platform_data {
           prevents stopping internal clock, increasing
           thereby power consumption in suspended state. */
        unsigned remote_wakeup_enable:1;
-       /* Switch or not to switch (keep always powered) */
-       unsigned no_power_switching:1;
-       /* Ganged port power switching (0) or individual port
-          power switching (1) */
-       unsigned power_switching_mode:1;
-       /* Hardware reset set/clear. If implemented, this function must:
-          if set == 0,   deassert chip's HW reset pin
-          otherwise,     assert chip's HW reset pin       */
-       void (*reset) (struct device * dev, int set);
-       /* Hardware clock start/stop. If implemented, this function must:
-          if start == 0,    stop the external clock
-          otherwise,        start the external clock
-        */
-       void (*clock) (struct device * dev, int start);
        /* Inter-io delay (ns). The chip is picky about access timings; it
           expects at least:
           150ns delay between consecutive accesses to DATA_REG,