diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-08-12 15:45:44 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-08-12 15:45:44 +0000 |
| commit | 143ed290f02496fb918789cf14949e4e8033d34d (patch) | |
| tree | 02a2f503d4b6fac4598f326b8fa7ad009055c8c2 /arch/arm/mach-imx/mach-mx31lilly.c | |
| parent | ac9cf9ff4f4ffa355d0e93c2bd6d74961a16efad (diff) | |
| parent | d9c927833a42b4eaae4addd031f780f4530f7a2d (diff) | |
| download | linux-3.10-143ed290f02496fb918789cf14949e4e8033d34d.tar.gz linux-3.10-143ed290f02496fb918789cf14949e4e8033d34d.tar.bz2 linux-3.10-143ed290f02496fb918789cf14949e4e8033d34d.zip | |
Merge branch 'imx-fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
Diffstat (limited to 'arch/arm/mach-imx/mach-mx31lilly.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-mx31lilly.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-mx31lilly.c b/arch/arm/mach-imx/mach-mx31lilly.c index 750368ddf0f..126913ad106 100644 --- a/arch/arm/mach-imx/mach-mx31lilly.c +++ b/arch/arm/mach-imx/mach-mx31lilly.c @@ -192,7 +192,7 @@ static struct mxc_usbh_platform_data usbh2_pdata __initdata = { .portsc = MXC_EHCI_MODE_ULPI | MXC_EHCI_UTMI_8BIT, }; -static void lilly1131_usb_init(void) +static void __init lilly1131_usb_init(void) { imx31_add_mxc_ehci_hs(1, &usbh1_pdata); |