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.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
include
/
asm-parisc
/
psw.h
diff --git
a/include/asm-parisc/psw.h
b/include/asm-parisc/psw.h
index
4334d6c
..
5a3e23c
100644
(file)
--- a/
include/asm-parisc/psw.h
+++ b/
include/asm-parisc/psw.h
@@
-1,6
+1,5
@@
#ifndef _PARISC_PSW_H
-#include <linux/config.h>
#define PSW_I 0x00000001
#define PSW_D 0x00000002