Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756530AbZKMPSR (ORCPT ); Fri, 13 Nov 2009 10:18:17 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757160AbZKMPQX (ORCPT ); Fri, 13 Nov 2009 10:16:23 -0500 Received: from mtagate3.de.ibm.com ([195.212.17.163]:44440 "EHLO mtagate3.de.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755973AbZKMPJE (ORCPT ); Fri, 13 Nov 2009 10:09:04 -0500 Message-Id: <20091113150911.577400905@de.ibm.com> User-Agent: quilt/0.48-1 Date: Fri, 13 Nov 2009 16:08:37 +0100 From: Martin Schwidefsky To: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Heiko Carstens Subject: [patch 13/52] [PATCH] use generic sockios.h header file References: <20091113150824.351347652@de.ibm.com> Content-Disposition: inline; filename=112-sockios-generic.diff Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1167 Lines: 37 From: Christian Borntraeger Index: quilt-2.6/arch/s390/include/asm/sockios.h =================================================================== --- quilt-2.6.orig/arch/s390/include/asm/sockios.h 2009-11-13 15:48:32.000000000 +0100 +++ quilt-2.6/arch/s390/include/asm/sockios.h 2009-11-13 16:08:14.000000000 +0100 @@ -1,21 +1,6 @@ -/* - * include/asm-s390/sockios.h - * - * S390 version - * - * Derived from "include/asm-i386/sockios.h" - */ +#ifndef _ASM_S390_SOCKIOS_H +#define _ASM_S390_SOCKIOS_H -#ifndef __ARCH_S390_SOCKIOS__ -#define __ARCH_S390_SOCKIOS__ - -/* Socket-level I/O control calls. */ -#define FIOSETOWN 0x8901 -#define SIOCSPGRP 0x8902 -#define FIOGETOWN 0x8903 -#define SIOCGPGRP 0x8904 -#define SIOCATMARK 0x8905 -#define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */ -#define SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */ +#include #endif -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/