summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-u300/spi.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-12-23 08:41:14 +0100
committerGrant Likely <grant.likely@secretlab.ca>2010-12-23 08:41:14 +0100
commitcfb13c5db08c90311a5defdde9a0328ee788cca5 (patch)
tree842cb60d1d19b99e550fdbc653723e4b13e51ee5 /arch/arm/mach-u300/spi.c
parentof/net: Move of_get_mac_address() to a common source file. (diff)
parentLinux 2.6.37-rc7 (diff)
downloadlinux-cfb13c5db08c90311a5defdde9a0328ee788cca5.tar.xz
linux-cfb13c5db08c90311a5defdde9a0328ee788cca5.zip
Merge commit 'v2.6.37-rc7' into devicetree/next
Diffstat (limited to 'arch/arm/mach-u300/spi.c')
-rw-r--r--arch/arm/mach-u300/spi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-u300/spi.c b/arch/arm/mach-u300/spi.c
index edb2c0d255c2..00869def5420 100644
--- a/arch/arm/mach-u300/spi.c
+++ b/arch/arm/mach-u300/spi.c
@@ -67,7 +67,7 @@ static struct spi_board_info u300_spi_devices[] = {
.bus_num = 0, /* Only one bus on this chip */
.chip_select = 0,
/* Means SPI_CS_HIGH, change if e.g low CS */
- .mode = SPI_MODE_1 | SPI_LSB_FIRST | SPI_LOOP,
+ .mode = SPI_MODE_1 | SPI_LOOP,
},
#endif
};