git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v3.1-rc1' into imx-fixes
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
mach-mx31lilly.c
diff --git
a/arch/arm/mach-imx/mach-mx31lilly.c
b/arch/arm/mach-imx/mach-mx31lilly.c
index
750368d
..
126913a
100644
(file)
--- 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);