Skip to content

Commit

Permalink
[PATCH] sh/sh64: Fix bogus TIOCGICOUNT definitions
Browse files Browse the repository at this point in the history
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: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Paul Mundt authored and Linus Torvalds committed Feb 1, 2006
1 parent a3310bb commit 87f55e6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion include/asm-sh/ioctls.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
2 changes: 1 addition & 1 deletion include/asm-sh64/ioctls.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

0 comments on commit 87f55e6

Please sign in to comment.