ioctl: Use asm-generic/ioctls.h on cris (enables termiox)
authorJeff Mahoney <jeffm@suse.com>
Fri, 20 Aug 2010 21:14:04 +0000 (17:14 -0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 22 Oct 2010 17:19:59 +0000 (10:19 -0700)
commit8bc3372d9e57db3c65cf00cea6cf14969875b055
tree052719305c47ba98417b4b5fbd1ab4e563d91fcb
parent94da7d6f1ff3793669946146d9b6ab9c608b938e
ioctl: Use asm-generic/ioctls.h on cris (enables termiox)

This patch converts cris 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:

- CRIS defines two ioctls: TIOCSERSETRS485 and TIOCSERWRRS485,
  kept in arch-specific portion
- CRIS defines a different value for TIOCSRS485, kept via ifndef in generic
- The generic version adds support for termiox

Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
arch/cris/include/asm/ioctls.h
include/asm-generic/ioctls.h