ASoC: Merge branch 'for-2.6.39' into for-2.6.40

[sfrench/cifs-2.6.git] / drivers / staging / intel_sst / intelmid.c

diff --git a/drivers/staging/intel_sst/intelmid.c b/drivers/staging/intel_sst/intelmid.c
index 4e4e4a96d863a5c5b0b10fae9fd510e0fa15334f..ebb6d03552c4b5282cb748d6ce429fd5c1f9bf3c 100644 (file)
--- a/drivers/staging/intel_sst/intelmid.c
+++ b/drivers/staging/intel_sst/intelmid.c
@@ -776,7 +776,7 @@ static int __devinit snd_intelmad_sst_register(
                if (ret_val)
                        return ret_val;
                sst_card_vendor_id = (vendor_addr.value & (MASK2|MASK1|MASK0));
-               pr_debug("orginal n extrated vendor id = 0x%x %d\n",
+               pr_debug("original n extrated vendor id = 0x%x %d\n",
                                vendor_addr.value, sst_card_vendor_id);
                if (sst_card_vendor_id < 0 || sst_card_vendor_id > 2) {
                        pr_err("vendor card not supported!!\n");