lockdep: Provide off case for redundant_hardirqs_on increment

[safe/jmp/linux-2.6] / drivers / char / rocket.h

diff --git a/drivers/char/rocket.h b/drivers/char/rocket.h
index ae6b04f..ec863f3 100644 (file)
--- a/drivers/char/rocket.h
+++ b/drivers/char/rocket.h
@@ -39,7 +39,7 @@ struct rocket_version {
 /*
  * Rocketport flags
  */
-#define ROCKET_CALLOUT_NOHUP    0x00000001
+/*#define ROCKET_CALLOUT_NOHUP    0x00000001 */
 #define ROCKET_FORCE_CD                0x00000002
 #define ROCKET_HUP_NOTIFY      0x00000004
 #define ROCKET_SPLIT_TERMIOS   0x00000008
@@ -64,8 +64,8 @@ struct rocket_version {
 /*
  * For closing_wait and closing_wait2
  */
-#define ROCKET_CLOSING_WAIT_NONE       65535
-#define ROCKET_CLOSING_WAIT_INF                0
+#define ROCKET_CLOSING_WAIT_NONE       ASYNC_CLOSING_WAIT_NONE
+#define ROCKET_CLOSING_WAIT_INF                ASYNC_CLOSING_WAIT_INF
 
 /*
  * Rocketport ioctls -- "RP"