diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-21 20:36:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-21 20:36:26 -0800 |
| commit | 0cda56962b883cd5e7aa036350e5a0283a88c590 (patch) | |
| tree | acb54a8550f3d768a45ad297761f8f6cba90d19e /include/linux | |
| parent | b0d81664a0092d8f6df7742b5aee6fcfd326b36c (diff) | |
| parent | 91a13c281d7d4648c0b32dede11a0144c4e7984c (diff) | |
Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
* 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
drivers/base/node.c: fix compilation error with older versions of gcc
uio: documentation fixups
device.h: Fix struct member documentation
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/device.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 52b3a4111df..3136ede5a1e 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -69,7 +69,7 @@ extern void bus_remove_file(struct bus_type *, struct bus_attribute *); * @resume: Called to bring a device on this bus out of sleep mode. * @pm: Power management operations of this bus, callback the specific * device driver's pm-ops. - * @iommu_ops IOMMU specific operations for this bus, used to attach IOMMU + * @iommu_ops: IOMMU specific operations for this bus, used to attach IOMMU * driver implementations to a bus and allow the driver to do * bus-specific setup * @p: The private data of the driver core, only the driver core can |