diff options
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/Kbuild | 4 | ||||
| -rw-r--r-- | include/asm-generic/mman-common.h (renamed from include/asm-generic/mman.h) | 6 | ||||
| -rw-r--r-- | include/asm-generic/signal-defs.h (renamed from include/asm-generic/signal.h) | 6 | ||||
| -rw-r--r-- | include/asm-generic/termios-base.h (renamed from include/asm-generic/termios.h) | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild index 4c9932a2503f..460b08d51e2e 100644 --- a/include/asm-generic/Kbuild +++ b/include/asm-generic/Kbuild @@ -2,9 +2,9 @@ header-y += errno-base.h header-y += errno.h header-y += fcntl.h header-y += ioctl.h -header-y += mman.h +header-y += mman-common.h header-y += poll.h -header-y += signal.h +header-y += signal-defs.h header-y += statfs.h unifdef-y += int-l64.h diff --git a/include/asm-generic/mman.h b/include/asm-generic/mman-common.h index 5e3dde2ee5ad..3b69ad34189a 100644 --- a/include/asm-generic/mman.h +++ b/include/asm-generic/mman-common.h @@ -1,5 +1,5 @@ -#ifndef _ASM_GENERIC_MMAN_H -#define _ASM_GENERIC_MMAN_H +#ifndef __ASM_GENERIC_MMAN_COMMON_H +#define __ASM_GENERIC_MMAN_COMMON_H /* Author: Michael S. Tsirkin <mst@mellanox.co.il>, Mellanox Technologies Ltd. @@ -38,4 +38,4 @@ /* compatibility flags */ #define MAP_FILE 0 -#endif +#endif /* __ASM_GENERIC_MMAN_COMMON_H */ diff --git a/include/asm-generic/signal.h b/include/asm-generic/signal-defs.h index dae1d8720076..00f95df54297 100644 --- a/include/asm-generic/signal.h +++ b/include/asm-generic/signal-defs.h @@ -1,5 +1,5 @@ -#ifndef __ASM_GENERIC_SIGNAL_H -#define __ASM_GENERIC_SIGNAL_H +#ifndef __ASM_GENERIC_SIGNAL_DEFS_H +#define __ASM_GENERIC_SIGNAL_DEFS_H #include <linux/compiler.h> @@ -25,4 +25,4 @@ typedef __restorefn_t __user *__sigrestore_t; #define SIG_ERR ((__force __sighandler_t)-1) /* error return from signal */ #endif -#endif /* __ASM_GENERIC_SIGNAL_H */ +#endif /* __ASM_GENERIC_SIGNAL_DEFS_H */ diff --git a/include/asm-generic/termios.h b/include/asm-generic/termios-base.h index 7d39ecc92d94..0a769feb22b0 100644 --- a/include/asm-generic/termios.h +++ b/include/asm-generic/termios-base.h @@ -1,8 +1,8 @@ /* termios.h: generic termios/termio user copying/translation */ -#ifndef _ASM_GENERIC_TERMIOS_H -#define _ASM_GENERIC_TERMIOS_H +#ifndef _ASM_GENERIC_TERMIOS_BASE_H +#define _ASM_GENERIC_TERMIOS_BASE_H #include <asm/uaccess.h> @@ -74,4 +74,4 @@ static inline int kernel_termios_to_user_termio(struct termio __user *termio, #endif /* __ARCH_TERMIO_GETPUT */ -#endif /* _ASM_GENERIC_TERMIOS_H */ +#endif /* _ASM_GENERIC_TERMIOS_BASE_H */ |
