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 'stable/generic' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
[pandora-kernel.git]
/
arch
/
arm
/
plat-mxc
/
include
/
mach
/
mxc_ehci.h
diff --git
a/arch/arm/plat-mxc/include/mach/mxc_ehci.h
b/arch/arm/plat-mxc/include/mach/mxc_ehci.h
index
7fc5f99
..
a523a40
100644
(file)
--- a/
arch/arm/plat-mxc/include/mach/mxc_ehci.h
+++ b/
arch/arm/plat-mxc/include/mach/mxc_ehci.h
@@
-31,6
+31,7
@@
#define MXC_USBCTRL_OFFSET 0
#define MXC_USB_PHY_CTR_FUNC_OFFSET 0x8
#define MXC_USB_PHY_CTR_FUNC2_OFFSET 0xc
#define MXC_USBCTRL_OFFSET 0
#define MXC_USB_PHY_CTR_FUNC_OFFSET 0x8
#define MXC_USB_PHY_CTR_FUNC2_OFFSET 0xc
+#define MXC_USBH2CTRL_OFFSET 0x14
#define MX5_USBOTHER_REGS_OFFSET 0x800
#define MX5_USBOTHER_REGS_OFFSET 0x800