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 branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
include
/
asm-x86
/
unistd.h
diff --git
a/include/asm-x86/unistd.h
b/include/asm-x86/unistd.h
index
effc7ad
..
2a58ed3
100644
(file)
--- a/
include/asm-x86/unistd.h
+++ b/
include/asm-x86/unistd.h
@@
-1,5
+1,11
@@
#ifdef __KERNEL__
-# if defined(CONFIG_X86_32) || defined(__i386__)
+# ifdef CONFIG_X86_32
+# include "unistd_32.h"
+# else
+# include "unistd_64.h"
+# endif
+#else
+# ifdef __i386__
# include "unistd_32.h"
# else
# include "unistd_64.h"