diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-26 21:40:19 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-26 21:40:19 -0400 |
| commit | f35c69b736e4f910d7447346980145212c283570 (patch) | |
| tree | 824b90cd870e6de07bbba19d761c1c74cf1fb4a7 /arch/avr32/include/uapi | |
| parent | cd4373984a5903276f52777a6003425e023eaa7e (diff) | |
| parent | e4aa937ec75df0eea0bee03bffa3303ad36c986b (diff) | |
Merge 3.10-rc3 into char-misc-next
We want the changes in here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/avr32/include/uapi')
| -rw-r--r-- | arch/avr32/include/uapi/asm/Kbuild | 1 | ||||
| -rw-r--r-- | arch/avr32/include/uapi/asm/param.h | 18 |
2 files changed, 1 insertions, 18 deletions
diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild index df53e7a46774..3b85eaddf525 100644 --- a/arch/avr32/include/uapi/asm/Kbuild +++ b/arch/avr32/include/uapi/asm/Kbuild | |||
| @@ -33,3 +33,4 @@ header-y += termbits.h | |||
| 33 | header-y += termios.h | 33 | header-y += termios.h |
| 34 | header-y += types.h | 34 | header-y += types.h |
| 35 | header-y += unistd.h | 35 | header-y += unistd.h |
| 36 | generic-y += param.h | ||
diff --git a/arch/avr32/include/uapi/asm/param.h b/arch/avr32/include/uapi/asm/param.h deleted file mode 100644 index d28aa5ee6d37..000000000000 --- a/arch/avr32/include/uapi/asm/param.h +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | #ifndef _UAPI__ASM_AVR32_PARAM_H | ||
| 2 | #define _UAPI__ASM_AVR32_PARAM_H | ||
| 3 | |||
| 4 | |||
| 5 | #ifndef HZ | ||
| 6 | # define HZ 100 | ||
| 7 | #endif | ||
| 8 | |||
| 9 | /* TODO: Should be configurable */ | ||
| 10 | #define EXEC_PAGESIZE 4096 | ||
| 11 | |||
| 12 | #ifndef NOGROUP | ||
| 13 | # define NOGROUP (-1) | ||
| 14 | #endif | ||
| 15 | |||
| 16 | #define MAXHOSTNAMELEN 64 | ||
| 17 | |||
| 18 | #endif /* _UAPI__ASM_AVR32_PARAM_H */ | ||