diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 19:38:02 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 19:38:02 +0200 |
| commit | 3aed77bc84013fced136977b7cc17fff60eddf7a (patch) | |
| tree | 75ee4060f58f033deb16771a303fb55dd370b6f9 /include/asm-powerpc/termbits.h | |
| parent | [PATCH] Fix misspelled i8259 typo in io_apic.c (diff) | |
| parent | Allow PCI config space syscalls to be used by 64-bit processes. (diff) | |
| download | linux-3aed77bc84013fced136977b7cc17fff60eddf7a.tar.xz linux-3aed77bc84013fced136977b7cc17fff60eddf7a.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6
Diffstat (limited to 'include/asm-powerpc/termbits.h')
| -rw-r--r-- | include/asm-powerpc/termbits.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-powerpc/termbits.h b/include/asm-powerpc/termbits.h index 2c5bf85a8c3c..ebf6055481dc 100644 --- a/include/asm-powerpc/termbits.h +++ b/include/asm-powerpc/termbits.h @@ -1,5 +1,5 @@ -#ifndef _POWERPC_TERMBITS_H -#define _POWERPC_TERMBITS_H +#ifndef _ASM_POWERPC_TERMBITS_H +#define _ASM_POWERPC_TERMBITS_H /* * This program is free software; you can redistribute it and/or @@ -188,4 +188,4 @@ struct termios { #define TCSADRAIN 1 #define TCSAFLUSH 2 -#endif /* _POWERPC_TERMBITS_H */ +#endif /* _ASM_POWERPC_TERMBITS_H */ |