From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Fri, 30 Jul 2004 19:19:03 +0000 (+0000)
Subject: Fix the merge fix
X-Git-Tag: after-ipod-patch~24
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=52eedf45eb64977e63502a2694b9b51197ede29f;p=linux-2.6.git

Fix the merge fix
---

diff --git a/kernel/sched.c b/kernel/sched.c
index 5d251348a..fa04c39c8 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -366,9 +366,6 @@ static inline struct task_struct * rq_get_next_task(struct runqueue* rq)
 		array = queue->active;
 		//check switch active/expired queue
 		if (unlikely(!queue->active->nr_active)) {
-			prio_array_t *array;
-		       
-			array = queue->active;
 			queue->active = queue->expired;
 			queue->expired = array;
 			queue->expired_timestamp = 0;