diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-12 10:08:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-12 10:08:06 -0800 |
| commit | a7cb7bb664543e4562ab0e9a072470d2d18c761f (patch) | |
| tree | 7c72fbbc681617be8c89b63c7e98a7e7b09c72de /drivers/media/pci | |
| parent | ccb5a4910d0ca7b1742b9217db2e1b95817e25ac (diff) | |
| parent | 078014dd36989c66378dfe80066c3f8a1f6952e8 (diff) | |
| download | blackbird-op-linux-a7cb7bb664543e4562ab0e9a072470d2d18c761f.tar.gz blackbird-op-linux-a7cb7bb664543e4562ab0e9a072470d2d18c761f.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree update from Jiri Kosina:
"Usual stuff: documentation updates, printk() fixes, etc"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (24 commits)
intel_ips: fix a type in error message
cpufreq: cpufreq-dt: Move newline to end of error message
ps3rom: fix error return code
treewide: fix typo in printk and Kconfig
ARM: dts: bcm63138: change "interupts" to "interrupts"
Replace mentions of "list_struct" to "list_head"
kernel: trace: fix printk message
scsi: mpt2sas: fix ioctl in comment
zbud, zswap: change module author email
clocksource: Fix 'clcoksource' typo in comment
arm: fix wording of "Crotex" in CONFIG_ARCH_EXYNOS3 help
gpio: msm-v1: make boolean argument more obvious
usb: Fix typo in usb-serial-simple.c
PCI: Fix comment typo 'COMFIG_PM_OPS'
powerpc: Fix comment typo 'CONIFG_8xx'
powerpc: Fix comment typos 'CONFiG_ALTIVEC'
clk: st: Spelling s/stucture/structure/
isci: Spelling s/stucture/structure/
usb: gadget: zero: Spelling s/infrastucture/infrastructure/
treewide: Fix company name in module descriptions
...
Diffstat (limited to 'drivers/media/pci')
| -rw-r--r-- | drivers/media/pci/cx18/cx18-driver.h | 2 | ||||
| -rw-r--r-- | drivers/media/pci/ttpci/budget-patch.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/pci/cx18/cx18-driver.h b/drivers/media/pci/cx18/cx18-driver.h index dcfd7a1d317e..207d6e82403b 100644 --- a/drivers/media/pci/cx18/cx18-driver.h +++ b/drivers/media/pci/cx18/cx18-driver.h @@ -290,7 +290,7 @@ struct cx18_options { * list_entry_is_past_end - check if a previous loop cursor is off list end * @pos: the type * previously used as a loop cursor. * @head: the head for your list. - * @member: the name of the list_struct within the struct. + * @member: the name of the list_head within the struct. * * Check if the entry's list_head is the head of the list, thus it's not a * real entry but was the loop cursor that walked past the end diff --git a/drivers/media/pci/ttpci/budget-patch.c b/drivers/media/pci/ttpci/budget-patch.c index 2cb35c23d2ac..a4d8867e1d7b 100644 --- a/drivers/media/pci/ttpci/budget-patch.c +++ b/drivers/media/pci/ttpci/budget-patch.c @@ -490,7 +490,7 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte if(detected == 0) printk("budget-patch not detected or saa7146 in non-default state.\n" - "try enabling ressetting of 7146 with MASK_31 in MC1 register\n"); + "try enabling resetting of 7146 with MASK_31 in MC1 register\n"); else printk("BUDGET-PATCH DETECTED.\n"); |
