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 tag 'pstore-v4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-davinci
/
psc.h
diff --git
a/arch/arm/mach-davinci/psc.h
b/arch/arm/mach-davinci/psc.h
index 99d47cfa301ff7d33de838c8bf8de597a0a21832..8af9f09fc10ce1dcab351389c77c706e86520cc4 100644
(file)
--- a/
arch/arm/mach-davinci/psc.h
+++ b/
arch/arm/mach-davinci/psc.h
@@
-171,6
+171,8
@@
#define DA8XX_LPSC1_I2C 11
#define DA8XX_LPSC1_UART1 12
#define DA8XX_LPSC1_UART2 13
+#define DA850_LPSC1_McBSP0 14
+#define DA850_LPSC1_McBSP1 15
#define DA8XX_LPSC1_LCDC 16
#define DA8XX_LPSC1_PWM 17
#define DA850_LPSC1_MMC_SD1 18