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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
arch
/
arm
/
plat-mxc
/
include
/
mach
/
mx1.h
diff --git
a/arch/arm/plat-mxc/include/mach/mx1.h
b/arch/arm/plat-mxc/include/mach/mx1.h
index
b92e023
..
1000bf3
100644
(file)
--- a/
arch/arm/plat-mxc/include/mach/mx1.h
+++ b/
arch/arm/plat-mxc/include/mach/mx1.h
@@
-179,7
+179,7
@@
#define DMA_REQ_UART1_T 30
#define DMA_REQ_UART1_R 31
-/* mandatory for CONFIG_
LL_DEBUG
*/
+/* mandatory for CONFIG_
DEBUG_LL
*/
#define MXC_LL_UART_PADDR UART1_BASE_ADDR
#define MXC_LL_UART_VADDR IO_ADDRESS(UART1_BASE_ADDR)