Merge ../linus

1 files changed, 0 insertions, 5 deletions

diff --git a/drivers/char/ip2/i2cmd.h b/drivers/char/ip2/i2cmd.h
index baa4e721b758..29277ec6b8ed 100644
--- a/drivers/char/ip2/i2cmd.h
+++ b/drivers/char/ip2/i2cmd.h
@@ -367,11 +367,6 @@ static UCHAR cc02[];
 #define CSE_NULL  3  // Replace with a null
 #define CSE_MARK  4  // Replace with a 3-character sequence (as Unix)
 
-#define  CMD_SET_REPLACEMENT(arg,ch)   \
-                        (((cmdSyntaxPtr)(ct36a))->cmd[1] = (arg), \
-                        (((cmdSyntaxPtr)(ct36a))->cmd[2] = (ch),  \
-                        (cmdSyntaxPtr)(ct36a))
-
 #define CSE_REPLACE  0x8        // Replace the errored character with the
                                                         // replacement character defined here