diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2012-09-13 19:48:07 +0800 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2012-10-15 10:02:19 +0800 |
commit | 3995eb82050a81e11217a0b88b2a5eddd53eb4d6 (patch) | |
tree | b1c04b25317c9dade08d911e8077c8745df8a954 /arch/arm/plat-mxc/include/mach/ulpi.h | |
parent | e0557c0d1a3a9c38af6777d308f98da12c94e137 (diff) |
ARM: imx: merge plat-mxc into mach-imx
It's really unnecessary to have plat-mxc, and let's merge it into
mach-imx. It's pretty much just a bunch of file renaming and
Kconfig/Makefile merge.
To make the change less invasive, we keep using Kconfig symbol
CONFIG_ARCH_MXC for mach-imx sub-architecture.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/ulpi.h')
-rw-r--r-- | arch/arm/plat-mxc/include/mach/ulpi.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/arm/plat-mxc/include/mach/ulpi.h b/arch/arm/plat-mxc/include/mach/ulpi.h deleted file mode 100644 index 42bdaca6d7d9..000000000000 --- a/arch/arm/plat-mxc/include/mach/ulpi.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef __MACH_ULPI_H -#define __MACH_ULPI_H - -#ifdef CONFIG_USB_ULPI -struct usb_phy *imx_otg_ulpi_create(unsigned int flags); -#else -static inline struct usb_phy *imx_otg_ulpi_create(unsigned int flags) -{ - return NULL; -} -#endif - -extern struct usb_phy_io_ops mxc_ulpi_access_ops; - -#endif /* __MACH_ULPI_H */ - |