diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-14 18:01:56 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-14 18:01:56 +0100 |
| commit | b89371621e5bedc84498ced2c5c33976bd1b2f64 (patch) | |
| tree | b309919239586e25617a17785b827577b1abb6b5 /include/sound | |
| parent | 63978ab3e3e963db28093b53bb4598f2702e1ad7 (diff) | |
| parent | 74c2b45b714e49b427584b4bd8f44f1a24d82d9c (diff) | |
| download | op-kernel-dev-b89371621e5bedc84498ced2c5c33976bd1b2f64.zip op-kernel-dev-b89371621e5bedc84498ced2c5c33976bd1b2f64.tar.gz | |
Merge branch 'next/isa' into topic/misc
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/ac97_codec.h | 2 | ||||
| -rw-r--r-- | include/sound/wm8993.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h index 3dae3f7..4940045 100644 --- a/include/sound/ac97_codec.h +++ b/include/sound/ac97_codec.h @@ -593,7 +593,7 @@ enum { struct ac97_quirk { unsigned short subvendor; /* PCI subsystem vendor id */ - unsigned short subdevice; /* PCI sybsystem device id */ + unsigned short subdevice; /* PCI subsystem device id */ unsigned short mask; /* device id bit mask, 0 = accept all */ unsigned int codec_id; /* codec id (if any), 0 = accept all */ const char *name; /* name shown as info */ diff --git a/include/sound/wm8993.h b/include/sound/wm8993.h index 9c661f2..eee19f6 100644 --- a/include/sound/wm8993.h +++ b/include/sound/wm8993.h @@ -36,7 +36,7 @@ struct wm8993_platform_data { unsigned int micbias1_lvl:1; unsigned int micbias2_lvl:1; - /* Jack detect threashold levels, see datasheet for values */ + /* Jack detect threshold levels, see datasheet for values */ unsigned int jd_scthr:2; unsigned int jd_thr:2; }; |
