From: Sam Ravnborg <sam@ravnborg.org>
Date: Thu, 5 Jun 2008 21:50:10 +0000 (+0200)
Subject: sparc: Merge asm-sparc{,64}/sockios.h
X-Git-Tag: v2.6.27-rc1~959^2~28
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e880e8701cd5a76bc5b9e67e48ab3b21963fbe0a;p=pandora-kernel.git

sparc: Merge asm-sparc{,64}/sockios.h

:$ diff -u include/asm-sparc/sockios.h include/asm-sparc64/sockios.h
:-- include/asm-sparc/sockios.h	2008-06-13 06:42:07.000000000 +0200
:++ include/asm-sparc64/sockios.h	2008-06-13 06:42:07.000000000 +0200
:@@ -1,5 +1,5 @@
:-#ifndef _ASM_SPARC_SOCKIOS_H
:-#define _ASM_SPARC_SOCKIOS_H
:+#ifndef _ASM_SPARC64_SOCKIOS_H
:+#define _ASM_SPARC64_SOCKIOS_H
:
: /* Socket-level I/O control calls. */
: #define FIOSETOWN 	0x8901
:@@ -10,5 +10,5 @@
: #define SIOCGSTAMP	0x8906		/* Get stamp (timeval) */
: #define SIOCGSTAMPNS	0x8907		/* Get stamp (timespec) */
:
:-#endif /* !(_ASM_SPARC_SOCKIOS_H) */
:+#endif /* !(_ASM_SPARC64_SOCKIOS_H) */

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---

Reading git-diff-tree failed