diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-01-14 20:09:49 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-01-14 20:09:49 +0100 |
| commit | 42a9fa9957e369240936891c9a521ab671eed4e7 (patch) | |
| tree | 7a9367594a367085c6a4a4433f687ec5c8dac8b7 /sound/core/init.c | |
| parent | spi: Enable SPI driver for S5P6440 and S5P6450 (diff) | |
| parent | mmc: sdhci-of: fix build on non-powerpc platforms (diff) | |
| download | linux-42a9fa9957e369240936891c9a521ab671eed4e7.tar.xz linux-42a9fa9957e369240936891c9a521ab671eed4e7.zip | |
Merge branch 'devicetree/next' into spi/next
Diffstat (limited to 'sound/core/init.c')
| -rw-r--r-- | sound/core/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/init.c b/sound/core/init.c index 57b792e2439a..3e65da21a08c 100644 --- a/sound/core/init.c +++ b/sound/core/init.c @@ -642,7 +642,7 @@ static struct device_attribute card_number_attrs = * external accesses. Thus, you should call this function at the end * of the initialization of the card. * - * Returns zero otherwise a negative error code if the registrain failed. + * Returns zero otherwise a negative error code if the registration failed. */ int snd_card_register(struct snd_card *card) { |