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/penberg...
[pandora-kernel.git]
/
arch
/
arm
/
mach-shmobile
/
include
/
mach
/
sh7372.h
diff --git
a/arch/arm/mach-shmobile/include/mach/sh7372.h
b/arch/arm/mach-shmobile/include/mach/sh7372.h
index
e4f9004
..
5736efc
100644
(file)
--- a/
arch/arm/mach-shmobile/include/mach/sh7372.h
+++ b/
arch/arm/mach-shmobile/include/mach/sh7372.h
@@
-455,6
+455,8
@@
enum {
SHDMA_SLAVE_SDHI1_TX,
SHDMA_SLAVE_SDHI2_RX,
SHDMA_SLAVE_SDHI2_TX,
SHDMA_SLAVE_SDHI1_TX,
SHDMA_SLAVE_SDHI2_RX,
SHDMA_SLAVE_SDHI2_TX,
+ SHDMA_SLAVE_MMCIF_RX,
+ SHDMA_SLAVE_MMCIF_TX,
};
extern struct clk sh7372_extal1_clk;
};
extern struct clk sh7372_extal1_clk;