diff options
| author | Stephen Warren <swarren@nvidia.com> | 2012-09-14 11:35:16 -0600 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2012-09-14 11:35:16 -0600 |
| commit | fef40b2369a4ececa16b4d02b625e45252fe5d0a (patch) | |
| tree | 22445e45f0882630e410b89e2a26fd3e9ba9c30b /arch/arm/mach-omap2/twl-common.c | |
| parent | f49540d1d7e90dc9864d96ad5a505d7feb8efbcc (diff) | |
| parent | 363366cf61c544ea476f3d220f43a95cb03014f5 (diff) | |
Merge commit 'xceiv-for-v3.7' into for-3.7/cleanup2
Diffstat (limited to 'arch/arm/mach-omap2/twl-common.c')
| -rw-r--r-- | arch/arm/mach-omap2/twl-common.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c index db5ff6642375..329b726012f3 100644 --- a/arch/arm/mach-omap2/twl-common.c +++ b/arch/arm/mach-omap2/twl-common.c @@ -251,11 +251,6 @@ void __init omap3_pmic_get_config(struct twl4030_platform_data *pmic_data, #if defined(CONFIG_ARCH_OMAP4) static struct twl4030_usb_data omap4_usb_pdata = { - .phy_init = omap4430_phy_init, - .phy_exit = omap4430_phy_exit, - .phy_power = omap4430_phy_power, - .phy_set_clock = omap4430_phy_set_clk, - .phy_suspend = omap4430_phy_suspend, }; static struct regulator_init_data omap4_vdac_idata = { |