diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
| commit | b2576e1d4408e134e2188c967b1f28af39cd79d4 (patch) | |
| tree | 004f3c82faab760f304ce031d6d2f572e7746a50 /drivers/char/rocket.h | |
| parent | 3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77 (diff) | |
| parent | 2150edc6c5cf00f7adb54538b9ea2a3e9cedca3f (diff) | |
Merge branch 'linus' into release
Diffstat (limited to 'drivers/char/rocket.h')
| -rw-r--r-- | drivers/char/rocket.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/rocket.h b/drivers/char/rocket.h index a8b09195ebba..ec863f35f1a9 100644 --- a/drivers/char/rocket.h +++ b/drivers/char/rocket.h | |||
| @@ -39,7 +39,7 @@ struct rocket_version { | |||
| 39 | /* | 39 | /* |
| 40 | * Rocketport flags | 40 | * Rocketport flags |
| 41 | */ | 41 | */ |
| 42 | #define ROCKET_CALLOUT_NOHUP 0x00000001 | 42 | /*#define ROCKET_CALLOUT_NOHUP 0x00000001 */ |
| 43 | #define ROCKET_FORCE_CD 0x00000002 | 43 | #define ROCKET_FORCE_CD 0x00000002 |
| 44 | #define ROCKET_HUP_NOTIFY 0x00000004 | 44 | #define ROCKET_HUP_NOTIFY 0x00000004 |
| 45 | #define ROCKET_SPLIT_TERMIOS 0x00000008 | 45 | #define ROCKET_SPLIT_TERMIOS 0x00000008 |