diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-22 18:06:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-22 18:06:57 -0700 |
| commit | 101b82f56d50a445bb5281f834c86e106732070f (patch) | |
| tree | 951e204487494557ca0f231e7fd8457bc58dddd2 /arch/avr32/include/uapi/asm/param.h | |
| parent | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus (diff) | |
| parent | avr32: fix building warnings caused by redefinitions of HZ (diff) | |
| download | linux-dev-101b82f56d50a445bb5281f834c86e106732070f.tar.xz linux-dev-101b82f56d50a445bb5281f834c86e106732070f.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32
Pull AVR32 update from Hans-Christian Egtvedt:
"wow, it has gone 10 releases since my last request :("
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
avr32: fix building warnings caused by redefinitions of HZ
avr32: fix relocation check for signed 18-bit offset
avr32: move NODES_SHIFT into Kconfig and delete numnodes.h
Diffstat (limited to 'arch/avr32/include/uapi/asm/param.h')
| -rw-r--r-- | arch/avr32/include/uapi/asm/param.h | 18 |
1 files changed, 0 insertions, 18 deletions
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 @@ -#ifndef _UAPI__ASM_AVR32_PARAM_H -#define _UAPI__ASM_AVR32_PARAM_H - - -#ifndef HZ -# define HZ 100 -#endif - -/* TODO: Should be configurable */ -#define EXEC_PAGESIZE 4096 - -#ifndef NOGROUP -# define NOGROUP (-1) -#endif - -#define MAXHOSTNAMELEN 64 - -#endif /* _UAPI__ASM_AVR32_PARAM_H */ |