git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/battery-2.6
[pandora-kernel.git]
/
arch
/
blackfin
/
include
/
asm
/
local.h
diff --git
a/arch/blackfin/include/asm/local.h
b/arch/blackfin/include/asm/local.h
index
75afffb
..
c11c530
100644
(file)
--- a/
arch/blackfin/include/asm/local.h
+++ b/
arch/blackfin/include/asm/local.h
@@
-1,6
+1
@@
-#ifndef __BLACKFIN_LOCAL_H
-#define __BLACKFIN_LOCAL_H
-
#include <asm-generic/local.h>
#include <asm-generic/local.h>
-
-#endif /* __BLACKFIN_LOCAL_H */