diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 19:04:50 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 19:04:50 -0500 |
commit | c32da02342b7521df25fefc2ef20aee0e61cf887 (patch) | |
tree | 7e38f664fa3e13602c357d37f77d8adcf82fccc2 /drivers/uwb | |
parent | dca1d9f6d7ae428c193f32bd3e9a4ca13176648b (diff) | |
parent | 318ae2edc3b29216abd8a2510f3f80b764f06858 (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: (56 commits)
doc: fix typo in comment explaining rb_tree usage
Remove fs/ntfs/ChangeLog
doc: fix console doc typo
doc: cpuset: Update the cpuset flag file
Fix of spelling in arch/sparc/kernel/leon_kernel.c no longer needed
Remove drivers/parport/ChangeLog
Remove drivers/char/ChangeLog
doc: typo - Table 1-2 should refer to "status", not "statm"
tree-wide: fix typos "ass?o[sc]iac?te" -> "associate" in comments
No need to patch AMD-provided drivers/gpu/drm/radeon/atombios.h
devres/irq: Fix devm_irq_match comment
Remove reference to kthread_create_on_cpu
tree-wide: Assorted spelling fixes
tree-wide: fix 'lenght' typo in comments and code
drm/kms: fix spelling in error message
doc: capitalization and other minor fixes in pnp doc
devres: typo fix s/dev/devm/
Remove redundant trailing semicolons from macros
fix typo "definetly" -> "definitely" in comment
tree-wide: s/widht/width/g typo in comments
...
Fix trivial conflict in Documentation/laptops/00-INDEX
Diffstat (limited to 'drivers/uwb')
-rw-r--r-- | drivers/uwb/i1480/i1480-est.c | 4 | ||||
-rw-r--r-- | drivers/uwb/uwbd.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/uwb/i1480/i1480-est.c b/drivers/uwb/i1480/i1480-est.c index 7bf8c6febae7..f2eb4d8b76c9 100644 --- a/drivers/uwb/i1480/i1480-est.c +++ b/drivers/uwb/i1480/i1480-est.c | |||
@@ -54,7 +54,7 @@ static struct uwb_est_entry i1480_est_fd01[] = { | |||
54 | .size = sizeof(struct i1480_rceb) + 2 }, | 54 | .size = sizeof(struct i1480_rceb) + 2 }, |
55 | }; | 55 | }; |
56 | 56 | ||
57 | static int i1480_est_init(void) | 57 | static int __init i1480_est_init(void) |
58 | { | 58 | { |
59 | int result = uwb_est_register(i1480_CET_VS1, 0x00, 0x8086, 0x0c3b, | 59 | int result = uwb_est_register(i1480_CET_VS1, 0x00, 0x8086, 0x0c3b, |
60 | i1480_est_fd00, | 60 | i1480_est_fd00, |
@@ -73,7 +73,7 @@ static int i1480_est_init(void) | |||
73 | } | 73 | } |
74 | module_init(i1480_est_init); | 74 | module_init(i1480_est_init); |
75 | 75 | ||
76 | static void i1480_est_exit(void) | 76 | static void __exit i1480_est_exit(void) |
77 | { | 77 | { |
78 | uwb_est_unregister(i1480_CET_VS1, 0x00, 0x8086, 0x0c3b, | 78 | uwb_est_unregister(i1480_CET_VS1, 0x00, 0x8086, 0x0c3b, |
79 | i1480_est_fd00, ARRAY_SIZE(i1480_est_fd00)); | 79 | i1480_est_fd00, ARRAY_SIZE(i1480_est_fd00)); |
diff --git a/drivers/uwb/uwbd.c b/drivers/uwb/uwbd.c index 5a777d8624da..6210fe1fd1bb 100644 --- a/drivers/uwb/uwbd.c +++ b/drivers/uwb/uwbd.c | |||
@@ -43,7 +43,7 @@ | |||
43 | * | 43 | * |
44 | * EVENTS | 44 | * EVENTS |
45 | * | 45 | * |
46 | * Events have a type, a subtype, a lenght, some other stuff and the | 46 | * Events have a type, a subtype, a length, some other stuff and the |
47 | * data blob, which depends on the event. The header is 'struct | 47 | * data blob, which depends on the event. The header is 'struct |
48 | * uwb_event'; for payloads, see 'struct uwbd_evt_*'. | 48 | * uwb_event'; for payloads, see 'struct uwbd_evt_*'. |
49 | * | 49 | * |