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 'parisc-5.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-pxa
/
pcm027.c
diff --git
a/arch/arm/mach-pxa/pcm027.c
b/arch/arm/mach-pxa/pcm027.c
index ccca9f7575c3597f530dd564eda804249d858d05..e2e6134496606e7e5c4a8adadccf3e518a38e08f 100644
(file)
--- a/
arch/arm/mach-pxa/pcm027.c
+++ b/
arch/arm/mach-pxa/pcm027.c
@@
-132,7
+132,7
@@
static struct platform_device smc91x_device = {
/*
* SPI host and devices
*/
-static struct pxa2xx_spi_
mast
er pxa_ssp_master_info = {
+static struct pxa2xx_spi_
controll
er pxa_ssp_master_info = {
.num_chipselect = 1,
};