diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /drivers/mmc/host/tmio_mmc_pio.c | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'drivers/mmc/host/tmio_mmc_pio.c')
| -rw-r--r-- | drivers/mmc/host/tmio_mmc_pio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c index 6ae8d2f00ec7..62d37de6de76 100644 --- a/drivers/mmc/host/tmio_mmc_pio.c +++ b/drivers/mmc/host/tmio_mmc_pio.c | |||
| @@ -355,7 +355,7 @@ static int tmio_mmc_start_command(struct tmio_mmc_host *host, struct mmc_command | |||
| 355 | /* | 355 | /* |
| 356 | * This chip always returns (at least?) as much data as you ask for. | 356 | * This chip always returns (at least?) as much data as you ask for. |
| 357 | * I'm unsure what happens if you ask for less than a block. This should be | 357 | * I'm unsure what happens if you ask for less than a block. This should be |
| 358 | * looked into to ensure that a funny length read doesnt hose the controller. | 358 | * looked into to ensure that a funny length read doesn't hose the controller. |
| 359 | */ | 359 | */ |
| 360 | static void tmio_mmc_pio_irq(struct tmio_mmc_host *host) | 360 | static void tmio_mmc_pio_irq(struct tmio_mmc_host *host) |
| 361 | { | 361 | { |