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 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
arm
/
mach-davinci
/
include
/
mach
/
psc.h
diff --git
a/arch/arm/mach-davinci/include/mach/psc.h
b/arch/arm/mach-davinci/include/mach/psc.h
index
62b0858
..
a47e6f2
100644
(file)
--- a/
arch/arm/mach-davinci/include/mach/psc.h
+++ b/
arch/arm/mach-davinci/include/mach/psc.h
@@
-150,7
+150,7
@@
#define DA8XX_LPSC0_SCR0_SS 10
#define DA8XX_LPSC0_SCR1_SS 11
#define DA8XX_LPSC0_SCR2_SS 12
-#define DA8XX_LPSC0_
DMAX
13
+#define DA8XX_LPSC0_
PRUSS
13
#define DA8XX_LPSC0_ARM 14
#define DA8XX_LPSC0_GEM 15