diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 12:12:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 12:12:26 -0400 |
| commit | 57d19e80f459dd845fb3cfeba8e6df8471bac142 (patch) | |
| tree | 8254766715720228db3d50f1ef3c7fe003c06d65 /drivers/dma | |
| parent | ee9ec4f82049c678373a611ce20ac67fe9ad836e (diff) | |
| parent | e64851f5a0ad6ec991f74ebb3108c35aa0323d5f (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
b43: fix comment typo reqest -> request
Haavard Skinnemoen has left Atmel
cris: typo in mach-fs Makefile
Kconfig: fix copy/paste-ism for dell-wmi-aio driver
doc: timers-howto: fix a typo ("unsgined")
perf: Only include annotate.h once in tools/perf/util/ui/browsers/annotate.c
md, raid5: Fix spelling error in comment ('Ofcourse' --> 'Of course').
treewide: fix a few typos in comments
regulator: change debug statement be consistent with the style of the rest
Revert "arm: mach-u300/gpio: Fix mem_region resource size miscalculations"
audit: acquire creds selectively to reduce atomic op overhead
rtlwifi: don't touch with treewide double semicolon removal
treewide: cleanup continuations and remove logging message whitespace
ath9k_hw: don't touch with treewide double semicolon removal
include/linux/leds-regulator.h: fix syntax in example code
tty: fix typo in descripton of tty_termios_encode_baud_rate
xtensa: remove obsolete BKL kernel option from defconfig
m68k: fix comment typo 'occcured'
arch:Kconfig.locks Remove unused config option.
treewide: remove extra semicolons
...
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/dmatest.c | 6 | ||||
| -rw-r--r-- | drivers/dma/dw_dmac.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c index e0888cb538d4..b4f5c32b6a47 100644 --- a/drivers/dma/dmatest.c +++ b/drivers/dma/dmatest.c | |||
| @@ -56,8 +56,8 @@ MODULE_PARM_DESC(pq_sources, | |||
| 56 | 56 | ||
| 57 | static int timeout = 3000; | 57 | static int timeout = 3000; |
| 58 | module_param(timeout, uint, S_IRUGO); | 58 | module_param(timeout, uint, S_IRUGO); |
| 59 | MODULE_PARM_DESC(timeout, "Transfer Timeout in msec (default: 3000), \ | 59 | MODULE_PARM_DESC(timeout, "Transfer Timeout in msec (default: 3000), " |
| 60 | Pass -1 for infinite timeout"); | 60 | "Pass -1 for infinite timeout"); |
| 61 | 61 | ||
| 62 | /* | 62 | /* |
| 63 | * Initialization patterns. All bytes in the source buffer has bit 7 | 63 | * Initialization patterns. All bytes in the source buffer has bit 7 |
| @@ -634,5 +634,5 @@ static void __exit dmatest_exit(void) | |||
| 634 | } | 634 | } |
| 635 | module_exit(dmatest_exit); | 635 | module_exit(dmatest_exit); |
| 636 | 636 | ||
| 637 | MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>"); | 637 | MODULE_AUTHOR("Haavard Skinnemoen (Atmel)"); |
| 638 | MODULE_LICENSE("GPL v2"); | 638 | MODULE_LICENSE("GPL v2"); |
diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c index 9c25c7d099e4..2a2e2fa00e91 100644 --- a/drivers/dma/dw_dmac.c +++ b/drivers/dma/dw_dmac.c | |||
| @@ -1486,4 +1486,4 @@ module_exit(dw_exit); | |||
| 1486 | 1486 | ||
| 1487 | MODULE_LICENSE("GPL v2"); | 1487 | MODULE_LICENSE("GPL v2"); |
| 1488 | MODULE_DESCRIPTION("Synopsys DesignWare DMA Controller driver"); | 1488 | MODULE_DESCRIPTION("Synopsys DesignWare DMA Controller driver"); |
| 1489 | MODULE_AUTHOR("Haavard Skinnemoen <haavard.skinnemoen@atmel.com>"); | 1489 | MODULE_AUTHOR("Haavard Skinnemoen (Atmel)"); |