diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2008-06-05 23:07:26 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-17 21:41:20 -0700 |
| commit | 4835bd988e58150c0a6e2d3e13e319a56ed821dc (patch) | |
| tree | 234cfa19414237c5574b7279dd267295a2584f9b /include/asm-xtensa/ioctls.h | |
| parent | f1ba03cac28edc4d68cca2475d50f463afcd2955 (diff) | |
sparc: Merge asm-sparc{,64}/param.h
:$ diff -u include/asm-sparc/param.h include/asm-sparc64/param.h
:-- include/asm-sparc/param.h 2008-06-13 06:46:39.000000000 +0200
:++ include/asm-sparc64/param.h 2008-06-13 06:42:07.000000000 +0200
:@@ -1,5 +1,6 @@
:-#ifndef _ASMSPARC_PARAM_H
:-#define _ASMSPARC_PARAM_H
:+#ifndef _ASMSPARC64_PARAM_H
:+#define _ASMSPARC64_PARAM_H
:+
:
: #ifdef __KERNEL__
: # define HZ CONFIG_HZ /* Internal kernel timer frequency */
:@@ -19,4 +20,4 @@
:
: #define MAXHOSTNAMELEN 64 /* max length of hostname */
:
:-#endif
:+#endif /* _ASMSPARC64_PARAM_H */
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'include/asm-xtensa/ioctls.h')
0 files changed, 0 insertions, 0 deletions