projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
[cascardo/linux.git]
/
include
/
linux
/
mfd
/
davinci_voicecodec.h
diff --git
a/include/linux/mfd/davinci_voicecodec.h
b/include/linux/mfd/davinci_voicecodec.h
index
cb01496
..
8e1cdbe
100644
(file)
--- a/
include/linux/mfd/davinci_voicecodec.h
+++ b/
include/linux/mfd/davinci_voicecodec.h
@@
-99,12
+99,6
@@
struct davinci_vcif {
dma_addr_t dma_rx_addr;
};
dma_addr_t dma_rx_addr;
};
-struct cq93vc {
- struct platform_device *pdev;
- struct snd_soc_codec *codec;
- u32 sysclk;
-};
-
struct davinci_vc;
struct davinci_vc {
struct davinci_vc;
struct davinci_vc {
@@
-122,7
+116,6
@@
struct davinci_vc {
/* Client devices */
struct davinci_vcif davinci_vcif;
/* Client devices */
struct davinci_vcif davinci_vcif;
- struct cq93vc cq93vc;
};
#endif
};
#endif