aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firewire
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-02-21 20:40:58 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-21 20:40:58 -0500
commit9afa3195b96da7d2320ec44d19fbfbded7a15571 (patch)
tree15c4222de2a2b2814c9430dcb4e997b18597881c /drivers/firewire
parent7c2db36e730ee4facd341679ecb21ee73ba92831 (diff)
parentdf63447f1a4402d7d9c6a9cd1c39a6d6766452d1 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina: "Assorted tiny fixes queued in trivial tree" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (22 commits) DocBook: update EXPORT_SYMBOL entry to point at export.h Documentation: update top level 00-INDEX file with new additions ARM: at91/ide: remove unsused at91-ide Kconfig entry percpu_counter.h: comment code for better readability x86, efi: fix comment typo in head_32.S IB: cxgb3: delay freeing mem untill entirely done with it net: mvneta: remove unneeded version.h include time: x86: report_lost_ticks doesn't exist any more pcmcia: avoid static analysis complaint about use-after-free fs/jfs: Fix typo in comment : 'how may' -> 'how many' of: add missing documentation for of_platform_populate() btrfs: remove unnecessary cur_trans set before goto loop in join_transaction sound: soc: Fix typo in sound/codecs treewide: Fix typo in various drivers btrfs: fix comment typos Update ibmvscsi module name in Kconfig. powerpc: fix typo (utilties -> utilities) of: fix spelling mistake in comment h8300: Fix home page URL in h8300/README xtensa: Fix home page URL in Kconfig ...
Diffstat (limited to 'drivers/firewire')
-rw-r--r--drivers/firewire/ohci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index 6ce6e07c38c1..45912e6e0ac2 100644
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -329,7 +329,7 @@ module_param_named(quirks, param_quirks, int, 0644);
329MODULE_PARM_DESC(quirks, "Chip quirks (default = 0" 329MODULE_PARM_DESC(quirks, "Chip quirks (default = 0"
330 ", nonatomic cycle timer = " __stringify(QUIRK_CYCLE_TIMER) 330 ", nonatomic cycle timer = " __stringify(QUIRK_CYCLE_TIMER)
331 ", reset packet generation = " __stringify(QUIRK_RESET_PACKET) 331 ", reset packet generation = " __stringify(QUIRK_RESET_PACKET)
332 ", AR/selfID endianess = " __stringify(QUIRK_BE_HEADERS) 332 ", AR/selfID endianness = " __stringify(QUIRK_BE_HEADERS)
333 ", no 1394a enhancements = " __stringify(QUIRK_NO_1394A) 333 ", no 1394a enhancements = " __stringify(QUIRK_NO_1394A)
334 ", disable MSI = " __stringify(QUIRK_NO_MSI) 334 ", disable MSI = " __stringify(QUIRK_NO_MSI)
335 ", TI SLLZ059 erratum = " __stringify(QUIRK_TI_SLLZ059) 335 ", TI SLLZ059 erratum = " __stringify(QUIRK_TI_SLLZ059)