diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 23:05:29 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 23:05:29 +0100 |
| commit | 9f9f265b0bd407233cfbc61acd64b90ff1da7ba4 (patch) | |
| tree | 3ede3c805a85cf3a097cb25abb8caaf050ac42dc /arch/arm/plat-omap | |
| parent | Merge branch 'omap/hwmod' into next/drivers (diff) | |
| parent | Merge branch 'ehci' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/l... (diff) | |
| download | linux-9f9f265b0bd407233cfbc61acd64b90ff1da7ba4.tar.xz linux-9f9f265b0bd407233cfbc61acd64b90ff1da7ba4.zip | |
Merge branch 'omap/ehci' into next/drivers
* omap/ehci:
MFD: OMAP: USB: Runtime PM support
ARM: OMAP: USBHOST: Replace usbhs core driver APIs by Runtime pm APIs
ARM: OMAP: USB: device name change for the clk names of usbhs
ARM: OMAP: USB: register hwmods of usbhs
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/usb.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/include/plat/usb.h b/arch/arm/plat-omap/include/plat/usb.h index 17d3c939775c..2b66dc266bcf 100644 --- a/arch/arm/plat-omap/include/plat/usb.h +++ b/arch/arm/plat-omap/include/plat/usb.h @@ -100,9 +100,6 @@ extern void usb_musb_init(struct omap_musb_board_data *board_data); extern void usbhs_init(const struct usbhs_omap_board_data *pdata); -extern int omap_usbhs_enable(struct device *dev); -extern void omap_usbhs_disable(struct device *dev); - extern int omap4430_phy_power(struct device *dev, int ID, int on); extern int omap4430_phy_set_clk(struct device *dev, int on); extern int omap4430_phy_init(struct device *dev); |