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/tiwai/sound
[pandora-kernel.git]
/
arch
/
arm
/
mach-w90x900
/
include
/
mach
/
nuc900_spi.h
diff --git
a/arch/arm/mach-w90x900/include/mach/nuc900_spi.h
b/arch/arm/mach-w90x900/include/mach/nuc900_spi.h
index
bd94819
..
2c4e0c1
100644
(file)
--- a/
arch/arm/mach-w90x900/include/mach/nuc900_spi.h
+++ b/
arch/arm/mach-w90x900/include/mach/nuc900_spi.h
@@
-14,7
+14,7
@@
#ifndef __ASM_ARCH_SPI_H
#define __ASM_ARCH_SPI_H
#ifndef __ASM_ARCH_SPI_H
#define __ASM_ARCH_SPI_H
-extern void mfp_set_groupg(struct device *dev);
+extern void mfp_set_groupg(struct device *dev
, const char *subname
);
struct nuc900_spi_info {
unsigned int num_cs;
struct nuc900_spi_info {
unsigned int num_cs;