| commit | 278864fac79c0c18b0a7f15ca589a4f0845b2fbc | |
| author | Sam Ravnborg <sam@ravnborg.org> | |
| Thu, 5 Jun 2008 20:44:29 +0000 (5 22:44 +0200) | ||
| committer | David S. Miller <davem@davemloft.net> | |
| Fri, 18 Jul 2008 04:41:06 +0000 (17 21:41 -0700) | ||
| tree | 522122bc499d9bf283c8eeef92be6b40bf1badf6 | treesnapshot (tar.gz zip) |
| parent | 09d3e1baa1f23bba39950990c5dddfb7fcc86238 | commitdiff |
sparc: Merge asm-sparc{,64}/ioctl.h
:$ diff -u include/asm-sparc/ioctl.h include/asm-sparc64/ioctl.h
:-- include/asm-sparc/ioctl.h 2008-06-13 06:46:39.000000000 +0200
:++ include/asm-sparc64/ioctl.h 2008-06-13 08:46:29.000000000 +0200
:@@ -1,5 +1,5 @@
:-#ifndef _SPARC_IOCTL_H
:-#define _SPARC_IOCTL_H
:+#ifndef _SPARC64_IOCTL_H
:+#define _SPARC64_IOCTL_H
:
:/*
:* Our DIR and SIZE overlap in order to simulteneously provide
:@@ -64,4 +64,4 @@
:#define IOCSIZE_MASK (_IOC_XSIZEMASK << _IOC_SIZESHIFT)
:#define IOCSIZE_SHIFT (_IOC_SIZESHIFT)
:
:-#endif /* !(_SPARC_IOCTL_H) */
:+#endif /* !(_SPARC64_IOCTL_H) */
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
:$ diff -u include/asm-sparc/ioctl.h include/asm-sparc64/ioctl.h
:-- include/asm-sparc/ioctl.h 2008-06-13 06:46:39.000000000 +0200
:++ include/asm-sparc64/ioctl.h 2008-06-13 08:46:29.000000000 +0200
:@@ -1,5 +1,5 @@
:-#ifndef _SPARC_IOCTL_H
:-#define _SPARC_IOCTL_H
:+#ifndef _SPARC64_IOCTL_H
:+#define _SPARC64_IOCTL_H
:
:/*
:* Our DIR and SIZE overlap in order to simulteneously provide
:@@ -64,4 +64,4 @@
:#define IOCSIZE_MASK (_IOC_XSIZEMASK << _IOC_SIZESHIFT)
:#define IOCSIZE_SHIFT (_IOC_SIZESHIFT)
:
:-#endif /* !(_SPARC_IOCTL_H) */
:+#endif /* !(_SPARC64_IOCTL_H) */
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| include/asm-sparc64/ioctl.h | diffblobblamehistory |