git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/core-cleanup' into for-linus
[safe/jmp/linux-2.6]
/
drivers
/
usb
/
musb
/
musb_core.h
diff --git
a/drivers/usb/musb/musb_core.h
b/drivers/usb/musb/musb_core.h
index
cd9f4a9
..
ac17b00
100644
(file)
--- a/
drivers/usb/musb/musb_core.h
+++ b/
drivers/usb/musb/musb_core.h
@@
-478,7
+478,7
@@
struct musb_context_registers {
u16 frame;
u8 index, testmode;
- u8 devctl, misc;
+ u8 devctl,
busctl,
misc;
struct musb_csr_regs index_regs[MUSB_C_NUM_EPS];
};