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 branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-pxa
/
include
/
mach
/
pxa2xx_spi.h
diff --git
a/arch/arm/mach-pxa/include/mach/pxa2xx_spi.h
b/arch/arm/mach-pxa/include/mach/pxa2xx_spi.h
index 2206cb61a9f918060d2416adea78fa83b1cfeae9..b87cecd9bbdc08fda122ed5842d7403af4be0f73 100644
(file)
--- a/
arch/arm/mach-pxa/include/mach/pxa2xx_spi.h
+++ b/
arch/arm/mach-pxa/include/mach/pxa2xx_spi.h
@@
-38,6
+38,7
@@
struct pxa2xx_spi_chip {
u8 dma_burst_size;
u32 timeout;
u8 enable_loopback;
+ int gpio_cs;
void (*cs_control)(u32 command);
};