From a9b3c2bde6c22b8fe9b58148506370ad529d0973 Mon Sep 17 00:00:00 2001 From: Wanpeng Li Date: Mon, 11 Jun 2012 19:04:27 +0000 Subject: [PATCH] --- yaml --- r: 313647 b: refs/heads/master c: f0a875fd3f7028af904b3a60347693812abd2aad h: refs/heads/master i: 313645: 2c7ae3a5cec367ae3cf62403c5fc2335a181b26b 313643: 71d3f43f56642372efc5d97998d78c2eb40c4dd1 313639: 263b836145fc6563c9147f1cedc9425aaa31d40f 313631: 1a080ee33b288124308093655500023982a2bc57 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/pci_of_scan.c | 1 - trunk/arch/powerpc/kernel/vio.c | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index fdce46ac1aaf..1e2f75ddf4d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5cb82da786f610f7e84a0a8bcf9e0218c363040 +refs/heads/master: f0a875fd3f7028af904b3a60347693812abd2aad diff --git a/trunk/arch/powerpc/kernel/pci_of_scan.c b/trunk/arch/powerpc/kernel/pci_of_scan.c index 89dde171a6fa..d7dd42bd1452 100644 --- a/trunk/arch/powerpc/kernel/pci_of_scan.c +++ b/trunk/arch/powerpc/kernel/pci_of_scan.c @@ -198,7 +198,6 @@ EXPORT_SYMBOL(of_create_pci_dev); /** * of_scan_pci_bridge - Set up a PCI bridge and scan for child nodes - * @node: device tree node of bridge * @dev: pci_dev structure for the bridge * * of_scan_bus() calls this routine for each PCI bridge that it finds, and diff --git a/trunk/arch/powerpc/kernel/vio.c b/trunk/arch/powerpc/kernel/vio.c index cb87301ccd55..06cbc309b817 100644 --- a/trunk/arch/powerpc/kernel/vio.c +++ b/trunk/arch/powerpc/kernel/vio.c @@ -625,7 +625,7 @@ struct dma_map_ops vio_dma_mapping_ops = { * vio_cmo_set_dev_desired - Set desired entitlement for a device * * @viodev: struct vio_dev for device to alter - * @new_desired: new desired entitlement level in bytes + * @desired: new desired entitlement level in bytes * * For use by devices to request a change to their entitlement at runtime or * through sysfs. The desired entitlement level is changed and a balancing @@ -1262,7 +1262,7 @@ static int vio_bus_remove(struct device *dev) /** * vio_register_driver: - Register a new vio driver - * @drv: The vio_driver structure to be registered. + * @viodrv: The vio_driver structure to be registered. */ int __vio_register_driver(struct vio_driver *viodrv, struct module *owner, const char *mod_name) @@ -1282,7 +1282,7 @@ EXPORT_SYMBOL(__vio_register_driver); /** * vio_unregister_driver - Remove registration of vio driver. - * @driver: The vio_driver struct to be removed form registration + * @viodrv: The vio_driver struct to be removed form registration */ void vio_unregister_driver(struct vio_driver *viodrv) {