diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-08-30 06:35:49 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-08-30 06:35:49 -0400 |
| commit | 3fd8a8041b3775840c8f85b6338b61beb5057160 (patch) | |
| tree | 2eb4fd3eae3168ae2837c4f98188fd25f62d5939 /kernel/wait.c | |
| parent | 1c9a341bbdc14051a4d8c74ea67269786c7d3736 (diff) | |
| parent | 6d52825fd4e78b251f4844f6662a3bc4e31671c7 (diff) | |
Merge tag 'asoc-v3.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.12
A few more updates for v3.12, mostly small cleanups plus the addition of
the DT bindings for kirkwood and the new i.MX S/PDIF driver.
Diffstat (limited to 'kernel/wait.c')
| -rw-r--r-- | kernel/wait.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/wait.c b/kernel/wait.c index dec68bd4e9d8..d550920e040c 100644 --- a/kernel/wait.c +++ b/kernel/wait.c | |||
| @@ -363,8 +363,7 @@ EXPORT_SYMBOL(out_of_line_wait_on_atomic_t); | |||
| 363 | 363 | ||
| 364 | /** | 364 | /** |
| 365 | * wake_up_atomic_t - Wake up a waiter on a atomic_t | 365 | * wake_up_atomic_t - Wake up a waiter on a atomic_t |
| 366 | * @word: The word being waited on, a kernel virtual address | 366 | * @p: The atomic_t being waited on, a kernel virtual address |
| 367 | * @bit: The bit of the word being waited on | ||
| 368 | * | 367 | * |
| 369 | * Wake up anyone waiting for the atomic_t to go to zero. | 368 | * Wake up anyone waiting for the atomic_t to go to zero. |
| 370 | * | 369 | * |