diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-24 06:25:44 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-24 06:25:54 -0400 |
| commit | 5f9ece02401116b29eb04396b99ea092acb75dd8 (patch) | |
| tree | e10386e2dc63c275646b4eb0bed857da7bf86c6a /arch/blackfin/kernel/sys_bfin.c | |
| parent | 9f51e24ee8b5a1595b6a5ac0c2be278a16488e75 (diff) | |
| parent | 422bef879e84104fee6dc68ded0e371dbeb5f88e (diff) | |
Merge commit 'v2.6.31-rc7' into x86/cleanups
Merge reason: we were on -rc1 before - go up to -rc7
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/blackfin/kernel/sys_bfin.c')
| -rw-r--r-- | arch/blackfin/kernel/sys_bfin.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/blackfin/kernel/sys_bfin.c b/arch/blackfin/kernel/sys_bfin.c index a8f1329c15a4..3da60fb13ce4 100644 --- a/arch/blackfin/kernel/sys_bfin.c +++ b/arch/blackfin/kernel/sys_bfin.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | 29 | * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | #include <linux/smp_lock.h> | ||
| 33 | #include <linux/spinlock.h> | 32 | #include <linux/spinlock.h> |
| 34 | #include <linux/sem.h> | 33 | #include <linux/sem.h> |
| 35 | #include <linux/msg.h> | 34 | #include <linux/msg.h> |