diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-12 21:27:47 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-12 21:27:47 -0400 |
| commit | b981d8b3f5e008ff10d993be633ad00564fc22cd (patch) | |
| tree | e292dc07b22308912cf6a58354a608b9e5e8e1fd /include/asm-x86/errno.h | |
| parent | b11d2127c4893a7315d1e16273bc8560049fa3ca (diff) | |
| parent | 2b9e0aae1d50e880c58d46788e5e3ebd89d75d62 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/macintosh/adbhid.c
Diffstat (limited to 'include/asm-x86/errno.h')
| -rw-r--r-- | include/asm-x86/errno.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/asm-x86/errno.h b/include/asm-x86/errno.h new file mode 100644 index 000000000000..9d511be8e573 --- /dev/null +++ b/include/asm-x86/errno.h | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | #ifdef __KERNEL__ | ||
| 2 | # ifdef CONFIG_X86_32 | ||
| 3 | # include "errno_32.h" | ||
| 4 | # else | ||
| 5 | # include "errno_64.h" | ||
| 6 | # endif | ||
| 7 | #else | ||
| 8 | # ifdef __i386__ | ||
| 9 | # include "errno_32.h" | ||
| 10 | # else | ||
| 11 | # include "errno_64.h" | ||
| 12 | # endif | ||
| 13 | #endif | ||