diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
| commit | fac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch) | |
| tree | 1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /arch/arm/mach-msm/scm.c | |
| parent | 6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff) | |
| parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) | |
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'arch/arm/mach-msm/scm.c')
| -rw-r--r-- | arch/arm/mach-msm/scm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/scm.c b/arch/arm/mach-msm/scm.c index cfa808dd4897..232f97a04504 100644 --- a/arch/arm/mach-msm/scm.c +++ b/arch/arm/mach-msm/scm.c | |||
| @@ -46,7 +46,7 @@ static DEFINE_MUTEX(scm_lock); | |||
| 46 | * @id: command to be executed | 46 | * @id: command to be executed |
| 47 | * @buf: buffer returned from scm_get_command_buffer() | 47 | * @buf: buffer returned from scm_get_command_buffer() |
| 48 | * | 48 | * |
| 49 | * An SCM command is layed out in memory as follows: | 49 | * An SCM command is laid out in memory as follows: |
| 50 | * | 50 | * |
| 51 | * ------------------- <--- struct scm_command | 51 | * ------------------- <--- struct scm_command |
| 52 | * | command header | | 52 | * | command header | |