diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-08-20 19:26:04 (GMT) |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-08-20 19:26:04 (GMT) |
commit | f0b433e9f362e0b7f0ce7d1489dd7feba068605d (patch) | |
tree | d4bfd9489cf4a96a55d83af20919f477a846d585 /include/linux/iio/machine.h | |
parent | fa2f5bf09610d3c216d4c74855edbe00d636467c (diff) | |
parent | 28c42c28309244d0b15d1b385e33429d59997679 (diff) | |
download | linux-fsl-qoriq-f0b433e9f362e0b7f0ce7d1489dd7feba068605d.tar.xz |
Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Additional updates for 3.6
A batch more bugfixes, all driver-specific and fairly small and
unremarkable in a global context. The biggest batch are for the newly
added Arizona drivers.
Diffstat (limited to 'include/linux/iio/machine.h')
-rw-r--r-- | include/linux/iio/machine.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/iio/machine.h b/include/linux/iio/machine.h index 0b1f19b..400a453 100644 --- a/include/linux/iio/machine.h +++ b/include/linux/iio/machine.h @@ -14,7 +14,7 @@ * This is matched against the datasheet_name element * of struct iio_chan_spec. * @consumer_dev_name: Name to uniquely identify the consumer device. - * @consumer_channel: Unique name used to idenitify the channel on the + * @consumer_channel: Unique name used to identify the channel on the * consumer side. */ struct iio_map { |