diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2008-06-05 22:45:50 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-17 21:41:16 -0700 |
| commit | f1ba03cac28edc4d68cca2475d50f463afcd2955 (patch) | |
| tree | a82ac2e79ae0c780173aa067f70e29e789d51454 /include/asm-sparc64/hugetlb.h | |
| parent | 278864fac79c0c18b0a7f15ca589a4f0845b2fbc (diff) | |
| download | talos-op-linux-f1ba03cac28edc4d68cca2475d50f463afcd2955.tar.gz talos-op-linux-f1ba03cac28edc4d68cca2475d50f463afcd2955.zip | |
sparc: Merge asm-sparc{,64}/ioctls.h
Trivial differenses in comments - used the version from sparc64
:$ diff -u include/asm-sparc/ioctls.h include/asm-sparc64/ioctls.h
:-- include/asm-sparc/ioctls.h 2008-06-13 08:46:29.000000000 +0200
:++ include/asm-sparc64/ioctls.h 2008-06-13 08:46:29.000000000 +0200
:@@ -1,5 +1,5 @@
:-#ifndef _ASM_SPARC_IOCTLS_H
:-#define _ASM_SPARC_IOCTLS_H
:+#ifndef _ASM_SPARC64_IOCTLS_H
:+#define _ASM_SPARC64_IOCTLS_H
:
: #include <asm/ioctl.h>
:
:@@ -22,7 +22,7 @@
:
: /* Note that all the ioctls that are not available in Linux have a
: * double underscore on the front to: a) avoid some programs to
:- * thing we support some ioctls under Linux (autoconfiguration stuff)
:+ * think we support some ioctls under Linux (autoconfiguration stuff)
: */
: /* Little t */
: #define TIOCGETD _IOR('t', 0, int)
:@@ -110,7 +110,7 @@
: #define TIOCSERGETLSR 0x5459 /* Get line status register */
: #define TIOCSERGETMULTI 0x545A /* Get multiport config */
: #define TIOCSERSETMULTI 0x545B /* Set multiport config */
:-#define TIOCMIWAIT 0x545C /* Wait input */
:+#define TIOCMIWAIT 0x545C /* Wait for change on serial input line(s) */
: #define TIOCGICOUNT 0x545D /* Read serial port inline interrupt counts */
:
: /* Kernel definitions */
:@@ -133,4 +133,4 @@
: #define TIOCPKT_NOSTOP 16
: #define TIOCPKT_DOSTOP 32
:
:-#endif /* !(_ASM_SPARC_IOCTLS_H) */
:+#endif /* !(_ASM_SPARC64_IOCTLS_H) */
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'include/asm-sparc64/hugetlb.h')
0 files changed, 0 insertions, 0 deletions
