git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-davinci
/
include
/
mach
/
dm355.h
diff --git
a/arch/arm/mach-davinci/include/mach/dm355.h
b/arch/arm/mach-davinci/include/mach/dm355.h
index 85536d8e8336dd2b127ea8ca908298bae36afd54..36dff4a0ce3f93ce9e0982713085b2c7285bcc02 100644
(file)
--- a/
arch/arm/mach-davinci/include/mach/dm355.h
+++ b/
arch/arm/mach-davinci/include/mach/dm355.h
@@
-15,6
+15,9
@@
#include <mach/asp.h>
#include <media/davinci/vpfe_capture.h>
+#define DM355_ASYNC_EMIF_CONTROL_BASE 0x01E10000
+#define DM355_ASYNC_EMIF_DATA_CE0_BASE 0x02000000
+
#define ASP1_TX_EVT_EN 1
#define ASP1_RX_EVT_EN 2