diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /arch/arm/mach-msm/scm.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
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 cfa808dd489..232f97a0450 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 | |