diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-14 17:04:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-14 17:04:19 -0800 |
| commit | 7d1fc01afc5af35e5197e0e75abe900f6bd279b8 (patch) | |
| tree | 4bebc92c83785335e132059d9965c8f9c0a03670 /drivers/soc | |
| parent | 0f0836b7eb1b9d14862ee40c7856227a3ead70db (diff) | |
| parent | bcf4299e6215a475259c3ac329d43e776cfe9c0c (diff) | |
| download | talos-obmc-linux-7d1fc01afc5af35e5197e0e75abe900f6bd279b8.tar.gz talos-obmc-linux-7d1fc01afc5af35e5197e0e75abe900f6bd279b8.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
floppy: make local variable non-static
exynos: fixes an incorrect header guard
dt-bindings: fixes some incorrect header guards
cpufreq-dt: correct dead link in documentation
cpufreq: ARM big LITTLE: correct dead link in documentation
treewide: Fix typos in printk
Documentation: filesystem: Fix typo in fs/eventfd.c
fs/super.c: use && instead of & for warn_on condition
Documentation: fix sysfs-ptp
lib: scatterlist: fix Kconfig description
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/ti/knav_dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/soc/ti/knav_dma.c b/drivers/soc/ti/knav_dma.c index bc1b80ec6afe..1a7b5caa127b 100644 --- a/drivers/soc/ti/knav_dma.c +++ b/drivers/soc/ti/knav_dma.c @@ -389,7 +389,7 @@ static int of_channel_match_helper(struct device_node *np, const char *name, *dma_instance = dma_node->name; index = of_property_match_string(np, "ti,navigator-dma-names", name); if (index < 0) { - dev_err(kdev->dev, "No 'ti,navigator-dma-names' propery\n"); + dev_err(kdev->dev, "No 'ti,navigator-dma-names' property\n"); return -ENODEV; } |
