diff options
author | Mark Brown | 2011-04-18 19:07:43 +0200 |
---|---|---|
committer | Mark Brown | 2011-04-18 19:07:43 +0200 |
commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
tree | 8b5e757a9847047102c475c6c583afc191d02e5b /sound/pci/ad1889.c | |
parent | Merge branch 'for-2.6.39' into for-2.6.40 (diff) | |
parent | ASoC: add a module alias to the FSI driver (diff) | |
download | kernel-qcow2-linux-d5381e42f64ca19f05c5799ffae5708acb6ed411.tar.gz kernel-qcow2-linux-d5381e42f64ca19f05c5799ffae5708acb6ed411.tar.xz kernel-qcow2-linux-d5381e42f64ca19f05c5799ffae5708acb6ed411.zip |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'sound/pci/ad1889.c')
-rw-r--r-- | sound/pci/ad1889.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c index 4382d0fa6b9a..d8f6fd65ebbb 100644 --- a/sound/pci/ad1889.c +++ b/sound/pci/ad1889.c @@ -29,7 +29,7 @@ * PM support * MIDI support * Game Port support - * SG DMA support (this will need *alot* of work) + * SG DMA support (this will need *a lot* of work) */ #include <linux/init.h> |