projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'acpi_pad', 'acpica', 'apei-bugzilla-43282', 'battery', 'cpuidle-coupl...
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
arch
/
arm
/
mach-orion5x
/
include
/
mach
/
bridge-regs.h
diff --git
a/arch/arm/mach-orion5x/include/mach/bridge-regs.h
b/arch/arm/mach-orion5x/include/mach/bridge-regs.h
index 96484bcd34ca66bf441cde80c8735cb591c29b40..11a3c1e9801f4bea759d6deb3ec9179b019c3650 100644
(file)
--- a/
arch/arm/mach-orion5x/include/mach/bridge-regs.h
+++ b/
arch/arm/mach-orion5x/include/mach/bridge-regs.h
@@
-35,5
+35,5
@@
#define MAIN_IRQ_MASK (ORION5X_BRIDGE_VIRT_BASE | 0x204)
#define TIMER_VIRT_BASE (ORION5X_BRIDGE_VIRT_BASE | 0x300)
-
+#define TIMER_PHYS_BASE (ORION5X_BRIDGE_PHYS_BASE | 0x300)
#endif