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 /sound/pci/asihpi/hpimsgx.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 'sound/pci/asihpi/hpimsgx.c')
| -rw-r--r-- | sound/pci/asihpi/hpimsgx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/asihpi/hpimsgx.c b/sound/pci/asihpi/hpimsgx.c index bcbdf30a6aa..360028b9abf 100644 --- a/sound/pci/asihpi/hpimsgx.c +++ b/sound/pci/asihpi/hpimsgx.c | |||
| @@ -722,7 +722,7 @@ static u16 HPIMSGX__init(struct hpi_message *phm, | |||
| 722 | return phr->error; | 722 | return phr->error; |
| 723 | } | 723 | } |
| 724 | if (hr.error == 0) { | 724 | if (hr.error == 0) { |
| 725 | /* the adapter was created succesfully | 725 | /* the adapter was created successfully |
| 726 | save the mapping for future use */ | 726 | save the mapping for future use */ |
| 727 | hpi_entry_points[hr.u.s.adapter_index] = entry_point_func; | 727 | hpi_entry_points[hr.u.s.adapter_index] = entry_point_func; |
| 728 | /* prepare adapter (pre-open streams etc.) */ | 728 | /* prepare adapter (pre-open streams etc.) */ |