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/scsi/sym53c8xx_2/sym_fw1.h | |
| 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/scsi/sym53c8xx_2/sym_fw1.h')
| -rw-r--r-- | drivers/scsi/sym53c8xx_2/sym_fw1.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sym53c8xx_2/sym_fw1.h b/drivers/scsi/sym53c8xx_2/sym_fw1.h index 7b08d6caaa99..63952ee300b5 100644 --- a/drivers/scsi/sym53c8xx_2/sym_fw1.h +++ b/drivers/scsi/sym53c8xx_2/sym_fw1.h | |||
| @@ -1449,7 +1449,7 @@ static struct SYM_FWB_SCR SYM_FWB_SCR = { | |||
| 1449 | PADDR_B (msg_weird_seen), | 1449 | PADDR_B (msg_weird_seen), |
| 1450 | /* | 1450 | /* |
| 1451 | * We donnot handle extended messages from SCRIPTS. | 1451 | * We donnot handle extended messages from SCRIPTS. |
| 1452 | * Read the amount of data correponding to the | 1452 | * Read the amount of data corresponding to the |
| 1453 | * message length and call the C code. | 1453 | * message length and call the C code. |
| 1454 | */ | 1454 | */ |
| 1455 | SCR_COPY (1), | 1455 | SCR_COPY (1), |