The patch titled docbook: add edd firmware interfaces has been added to the -mm tree. Its filename is docbook-add-edd-firmware-interfaces.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: docbook: add edd firmware interfaces From: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Cleanup kernel-doc notation in drivers/firmware/edd.c. Add edd.c to DocBook/kernel-api.tmpl. Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Acked-by: Matt Domsch <Matt_Domsch@xxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- Documentation/DocBook/kernel-api.tmpl | 3 +++ drivers/firmware/edd.c | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff -puN Documentation/DocBook/kernel-api.tmpl~docbook-add-edd-firmware-interfaces Documentation/DocBook/kernel-api.tmpl --- a/Documentation/DocBook/kernel-api.tmpl~docbook-add-edd-firmware-interfaces +++ a/Documentation/DocBook/kernel-api.tmpl @@ -316,6 +316,9 @@ X!Earch/i386/kernel/mca.c <sect1><title>DMI Interfaces</title> !Edrivers/firmware/dmi_scan.c </sect1> + <sect1><title>EDD Interfaces</title> +!Idrivers/firmware/edd.c + </sect1> </chapter> <chapter id="security"> diff -puN drivers/firmware/edd.c~docbook-add-edd-firmware-interfaces drivers/firmware/edd.c --- a/drivers/firmware/edd.c~docbook-add-edd-firmware-interfaces +++ a/drivers/firmware/edd.c @@ -233,6 +233,8 @@ edd_show_interface(struct edd_device *ed /** * edd_show_raw_data() - copies raw data to buffer for userspace to parse + * @edev: target edd_device + * @buf: output buffer * * Returns: number of bytes written, or -EINVAL on failure */ @@ -634,8 +636,8 @@ static decl_subsys(edd,&ktype_edd,NULL); /** * edd_dev_is_type() - is this EDD device a 'type' device? - * @edev - * @type - a host bus or interface identifier string per the EDD spec + * @edev: target edd_device + * @type: a host bus or interface identifier string per the EDD spec * * Returns 1 (TRUE) if it is a 'type' device, 0 otherwise. */ @@ -657,7 +659,7 @@ edd_dev_is_type(struct edd_device *edev, /** * edd_get_pci_dev() - finds pci_dev that matches edev - * @edev - edd_device + * @edev: edd_device * * Returns pci_dev if found, or NULL */ _ Patches currently in -mm which might be from randy.dunlap@xxxxxxxxxx are git-alsa.patch qconf-immediately-update-integer-and-string-values-in-xconfig-display-take-2.patch git-mtd.patch parisc-fix-module_param-iommu-permission.patch git-scsi-rc-fixes.patch megaraid-fix-kernel-doc.patch math-emu-setcc-avoid-gcc-extension.patch kernel-doc-allow-a-little-whitespace.patch sysrq-showblockedtasks-is-sysrq-w.patch sysrq-alphabetize-command-keys-doc.patch kernel-doc-allow-more-whitespace.patch discuss-a-couple-common-errors-in-kernel-doc-usage.patch megaraid-more-kernel-doc-fixes.patch docbook-add-edd-firmware-interfaces.patch kernel-doc-fix-some-odd-spacing-issues.patch extend-notifier_call_chain-to-count-nr_calls-made-fixes.patch reiser4-use-null-for-pointers.patch profile_likely-export-do_check_likely.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html