From: Jeff Mahoney <jeffm@suse.com>
Date: Fri, 20 Aug 2010 21:14:11 +0000 (-0400)
Subject: ioctl: Use asm-generic/ioctls.h on s390 (enables termiox)
X-Git-Tag: v2.6.37-rc1~155^2~34
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d838016af3b15452043256acad0be63f215115ba;p=pandora-kernel.git

ioctl: Use asm-generic/ioctls.h on s390 (enables termiox)

This patch converts s390 to use asm-generic/ioctls.h instead of its
own version.

The differences between the arch-specific version and the generic
version are as follows:

- S390 defines its own value for FIOQSIZE, asm-generic/ioctls.h keeps it
- The generic version adds TIOCGRS485 and TIOCGRS485, which are unused
  by any driver available on this architecture
- The generic version adds support for termiox

Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

Reading git-diff-tree failed