diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /drivers/char/nwbutton.c | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'drivers/char/nwbutton.c')
| -rw-r--r-- | drivers/char/nwbutton.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/nwbutton.c b/drivers/char/nwbutton.c index 8994ce32e6c7..04a480f86c6c 100644 --- a/drivers/char/nwbutton.c +++ b/drivers/char/nwbutton.c | |||
| @@ -75,7 +75,7 @@ int button_add_callback (void (*callback) (void), int count) | |||
| 75 | * with -EINVAL. If there is more than one entry with the same address, | 75 | * with -EINVAL. If there is more than one entry with the same address, |
| 76 | * because it searches the list from end to beginning, it will unregister the | 76 | * because it searches the list from end to beginning, it will unregister the |
| 77 | * last one to be registered first (FILO- First In Last Out). | 77 | * last one to be registered first (FILO- First In Last Out). |
| 78 | * Note that this is not neccessarily true if the entries are not submitted | 78 | * Note that this is not necessarily true if the entries are not submitted |
| 79 | * at the same time, because another driver could have unregistered a callback | 79 | * at the same time, because another driver could have unregistered a callback |
| 80 | * between the submissions creating a gap earlier in the list, which would | 80 | * between the submissions creating a gap earlier in the list, which would |
| 81 | * be filled first at submission time. | 81 | * be filled first at submission time. |