git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'powerpc-next' of master.kernel.org:/pub/scm/linux/kernel/git/galak...
[sfrench/cifs-2.6.git]
/
arch
/
m68k
/
atari
/
stram.c
diff --git
a/arch/m68k/atari/stram.c
b/arch/m68k/atari/stram.c
index 0055a6c06f755a9aa2ab0f10301782ecf4ab632e..04c69ffbea71635b23a1652e9c6159e37eb8f82c 100644
(file)
--- a/
arch/m68k/atari/stram.c
+++ b/
arch/m68k/atari/stram.c
@@
-29,7
+29,6
@@
#include <asm/atarihw.h>
#include <asm/atari_stram.h>
#include <asm/io.h>
-#include <asm/semaphore.h>
#undef DEBUG