diff options
-rw-r--r-- | arch/arm/mach-omap2/twl-common.c | 12 | ||||
-rw-r--r-- | include/linux/i2c/twl.h | 2 |
2 files changed, 1 insertions, 13 deletions
diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c index b0d54dae1bcb..4457e731f7a4 100644 --- a/arch/arm/mach-omap2/twl-common.c +++ b/arch/arm/mach-omap2/twl-common.c | |||
@@ -91,18 +91,8 @@ void __init omap_pmic_late_init(void) | |||
91 | } | 91 | } |
92 | 92 | ||
93 | #if defined(CONFIG_ARCH_OMAP3) | 93 | #if defined(CONFIG_ARCH_OMAP3) |
94 | struct phy_consumer consumers[] = { | ||
95 | PHY_CONSUMER("musb-hdrc.0", "usb"), | ||
96 | }; | ||
97 | |||
98 | struct phy_init_data init_data = { | ||
99 | .consumers = consumers, | ||
100 | .num_consumers = ARRAY_SIZE(consumers), | ||
101 | }; | ||
102 | |||
103 | static struct twl4030_usb_data omap3_usb_pdata = { | 94 | static struct twl4030_usb_data omap3_usb_pdata = { |
104 | .usb_mode = T2_USB_MODE_ULPI, | 95 | .usb_mode = T2_USB_MODE_ULPI, |
105 | .init_data = &init_data, | ||
106 | }; | 96 | }; |
107 | 97 | ||
108 | static int omap3_batt_table[] = { | 98 | static int omap3_batt_table[] = { |
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); |