summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/usb.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-05 11:45:22 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-05 11:45:22 +0100
commita140feab42d1cfd811930ab76104559c19dfc4b0 (patch)
tree41fd871990e888dd5616a6bf1891a1ff307221df /arch/arm/mach-davinci/usb.c
parent1075414b06109a99b0e87601e84c74a95bd45681 (diff)
parentfec6c6fec3e20637bee5d276fb61dd8b49a3f9cc (diff)
downloadkernel-crypto-a140feab42d1cfd811930ab76104559c19dfc4b0.tar.gz
kernel-crypto-a140feab42d1cfd811930ab76104559c19dfc4b0.tar.xz
kernel-crypto-a140feab42d1cfd811930ab76104559c19dfc4b0.zip
Merge commit 'v2.6.29-rc7' into core/locking
Diffstat (limited to 'arch/arm/mach-davinci/usb.c')
-rw-r--r--arch/arm/mach-davinci/usb.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/usb.c b/arch/arm/mach-davinci/usb.c
index 867ead2559a..69680784448 100644
--- a/arch/arm/mach-davinci/usb.c
+++ b/arch/arm/mach-davinci/usb.c
@@ -47,6 +47,7 @@ static struct musb_hdrc_platform_data usb_data = {
#elif defined(CONFIG_USB_MUSB_HOST)
.mode = MUSB_HOST,
#endif
+ .clock = "usb",
.config = &musb_config,
};