diff options
author | Heikki Krogerus <heikki.krogerus@linux.intel.com> | 2014-12-04 01:24:43 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <greg@kroah.com> | 2014-12-10 22:37:20 -0500 |
commit | 81e1dadfb5b2d47aa513ad60b1c9cf0ea17b6514 (patch) | |
tree | 6ad9270c0b25c0afdcdae64d88daca7d10ec884a /include/linux/i2c/twl.h | |
parent | 3ff67445750a84de67faaf52c6e1895cb09f2c56 (diff) |
arm: omap3: twl: remove usb phy init data
commit dbc98635e0d4 ("phy: remove the old lookup method") removes
struct phy_consumer but twl-common.c still uses the "phy_consumer"
structure resulting in the following compilation warning.
arch/arm/mach-omap2/twl-common.c:94:21: error: array type has
incomplete element type
struct phy_consumer consumers[] = {
Removed using phy_consumer since twl4030 uses the new lookup
method.
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Diffstat (limited to 'include/linux/i2c/twl.h')
-rw-r--r-- | include/linux/i2c/twl.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h index 8cfb50f38529..0bc03f100d04 100644 --- a/include/linux/i2c/twl.h +++ b/include/linux/i2c/twl.h | |||
@@ -26,7 +26,6 @@ | |||
26 | #define __TWL_H_ | 26 | #define __TWL_H_ |
27 | 27 | ||
28 | #include <linux/types.h> | 28 | #include <linux/types.h> |
29 | #include <linux/phy/phy.h> | ||
30 | #include <linux/input/matrix_keypad.h> | 29 | #include <linux/input/matrix_keypad.h> |
31 | 30 | ||
32 | /* | 31 | /* |
@@ -634,7 +633,6 @@ enum twl4030_usb_mode { | |||
634 | struct twl4030_usb_data { | 633 | struct twl4030_usb_data { |
635 | enum twl4030_usb_mode usb_mode; | 634 | enum twl4030_usb_mode usb_mode; |
636 | unsigned long features; | 635 | unsigned long features; |
637 | struct phy_init_data *init_data; | ||
638 | 636 | ||
639 | int (*phy_init)(struct device *dev); | 637 | int (*phy_init)(struct device *dev); |
640 | int (*phy_exit)(struct device *dev); | 638 | int (*phy_exit)(struct device *dev); |