diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
commit | 529c593ece216e4aaffd36bd940cb94f1fa63129 (patch) | |
tree | 78f1c0b805f5656aa7b0417a043c5346f700a2cf /include/video | |
parent | 0bd079751d25808d1972baee5c4eaa1db2227257 (diff) |
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'include/video')
-rw-r--r-- | include/video/macmodes.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/video/macmodes.h b/include/video/macmodes.h index 1bdfa815b..054bd9845 100644 --- a/include/video/macmodes.h +++ b/include/video/macmodes.h @@ -42,6 +42,7 @@ #define VMODE_CHOOSE 99 #define CMODE_NVRAM -1 +#define CMODE_CHOOSE -2 #define CMODE_8 0 /* 8 bits/pixel */ #define CMODE_16 1 /* 16 (actually 15) bits/pixel */ #define CMODE_32 2 /* 32 (actually 24) bits/pixel */ |