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 branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
usb-tusb6010.c
diff --git
a/arch/arm/mach-omap2/usb-tusb6010.c
b/arch/arm/mach-omap2/usb-tusb6010.c
index
30f112b
..
8a3c05f
100644
(file)
--- a/
arch/arm/mach-omap2/usb-tusb6010.c
+++ b/
arch/arm/mach-omap2/usb-tusb6010.c
@@
-224,7
+224,7
@@
static struct resource tusb_resources[] = {
static u64 tusb_dmamask = ~(u32)0;
static struct platform_device tusb_device = {
- .name = "musb
_hdrc
",
+ .name = "musb
-tusb
",
.id = -1,
.dev = {
.dma_mask = &tusb_dmamask,