summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorHeikki Krogerus <heikki.krogerus@linux.intel.com>2014-12-04 11:54:43 +0530
committerGreg Kroah-Hartman <greg@kroah.com>2014-12-10 22:37:20 -0500
commit81e1dadfb5b2d47aa513ad60b1c9cf0ea17b6514 (patch)
tree6ad9270c0b25c0afdcdae64d88daca7d10ec884a /include
parent3ff67445750a84de67faaf52c6e1895cb09f2c56 (diff)
downloadop-kernel-dev-81e1dadfb5b2d47aa513ad60b1c9cf0ea17b6514.zip
op-kernel-dev-81e1dadfb5b2d47aa513ad60b1c9cf0ea17b6514.tar.gz
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')
-rw-r--r--include/linux/i2c/twl.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
index 8cfb50f3..0bc03f1 100644
--- a/include/linux/i2c/twl.h
+++ b/include/linux/i2c/twl.h
@@ -26,7 +26,6 @@
#define __TWL_H_
#include <linux/types.h>
-#include <linux/phy/phy.h>
#include <linux/input/matrix_keypad.h>
/*
@@ -634,7 +633,6 @@ enum twl4030_usb_mode {
struct twl4030_usb_data {
enum twl4030_usb_mode usb_mode;
unsigned long features;
- struct phy_init_data *init_data;
int (*phy_init)(struct device *dev);
int (*phy_exit)(struct device *dev);
OpenPOWER on IntegriCloud