Merge git://git.infradead.org/battery-2.6

[pandora-kernel.git] / arch / frv / kernel / semaphore.c

diff --git a/arch/frv/kernel/semaphore.c b/arch/frv/kernel/semaphore.c
index f278cdf..7ee3a14 100644 (file)
--- a/arch/frv/kernel/semaphore.c
+++ b/arch/frv/kernel/semaphore.c
@@ -19,7 +19,7 @@ struct sem_waiter {
        struct task_struct      *task;
 };
 
-#if SEMAPHORE_DEBUG
+#ifdef CONFIG_DEBUG_SEMAPHORE
 void semtrace(struct semaphore *sem, const char *str)
 {
        if (sem->debug)
@@ -139,7 +139,7 @@ void __up(struct semaphore *sem)
        waiter = list_entry(sem->wait_list.next, struct sem_waiter, list);
 
        /* We must be careful not to touch 'waiter' after we set ->task = NULL.
-        * It is an allocated on the waiter's stack and may become invalid at
+        * It is allocated on the waiter's stack and may become invalid at
         * any time after that point (due to a wakeup from another source).
         */
        list_del_init(&waiter->list);