Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87f55e67 authored by Paul Mundt's avatar Paul Mundt Committed by Linus Torvalds
Browse files

[PATCH] sh/sh64: Fix bogus TIOCGICOUNT definitions 



As reported by Russell King, sh and sh64 currently have bogus definitions for
TIOCGICOUNT, particularly referencing a kernel only structure.  Switch to
using a sensible ioctl value.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a3310bbd

include/asm-sh/ioctls.h

+1 −1
Original line number Diff line number Diff line
@@ -94,6 +94,6 @@ 
#define TIOCSERSETMULTI _IOW('T', 91, struct serial_multiport_struct) /* 0x545B */ /* Set multiport config */



#define TIOCMIWAIT	_IO('T', 92) /* 0x545C */	/* wait for a change on serial input line(s) */

#define TIOCGICOUNT	_IOR('T', 93, struct async_icount) /* 0x545D */	/* read serial port inline interrupt counts */

#define TIOCGICOUNT	0x545D	/* read serial port inline interrupt counts */



#endif /* __ASM_SH_IOCTLS_H */

include/asm-sh64/ioctls.h

+1 −1
Original line number Diff line number Diff line
@@ -111,6 +111,6 @@ 
#define TIOCSERSETMULTI 0x40a8545b	/* _IOW('T', 91, struct serial_multiport_struct) 0x545B */ /* Set multiport config */



#define TIOCMIWAIT	0x545c		/* _IO('T', 92) wait for a change on serial input line(s) */

#define TIOCGICOUNT	0x802c545d	/* _IOR('T', 93, struct async_icount) 0x545D */	/* read serial port inline interrupt counts */

#define TIOCGICOUNT	0x545d		/* read serial port inline interrupt counts */



#endif /* __ASM_SH64_IOCTLS_H */