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 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
[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
47fd0bc
..
fa59c09
100644
(file)
--- a/
arch/arm/mach-davinci/include/mach/psc.h
+++ b/
arch/arm/mach-davinci/include/mach/psc.h
@@
-243,7
+243,7
@@
#define PSC_STATE_DISABLE 2
#define PSC_STATE_ENABLE 3
#define PSC_STATE_DISABLE 2
#define PSC_STATE_ENABLE 3
-#define MDSTAT_STATE_MASK 0x
1
f
+#define MDSTAT_STATE_MASK 0x
3
f
#define MDCTL_FORCE BIT(31)
#ifndef __ASSEMBLER__
#define MDCTL_FORCE BIT(31)
#ifndef __ASSEMBLER__