diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/spi/ep93xx_spi.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/spi/ep93xx_spi.c')
| -rw-r--r-- | drivers/spi/ep93xx_spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/ep93xx_spi.c b/drivers/spi/ep93xx_spi.c index 0ba35df9a6df..d3570071e98f 100644 --- a/drivers/spi/ep93xx_spi.c +++ b/drivers/spi/ep93xx_spi.c | |||
| @@ -512,7 +512,7 @@ static int ep93xx_spi_read_write(struct ep93xx_spi *espi) | |||
| 512 | * | 512 | * |
| 513 | * This function processes one SPI transfer given in @t. Function waits until | 513 | * This function processes one SPI transfer given in @t. Function waits until |
| 514 | * transfer is complete (may sleep) and updates @msg->status based on whether | 514 | * transfer is complete (may sleep) and updates @msg->status based on whether |
| 515 | * transfer was succesfully processed or not. | 515 | * transfer was successfully processed or not. |
| 516 | */ | 516 | */ |
| 517 | static void ep93xx_spi_process_transfer(struct ep93xx_spi *espi, | 517 | static void ep93xx_spi_process_transfer(struct ep93xx_spi *espi, |
| 518 | struct spi_message *msg, | 518 | struct spi_message *msg, |