diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-07-24 21:36:56 +0200 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-07-24 21:36:56 +0200 |
commit | b9f12a5d97f652c77ef6803dccd0d40d1290f5be (patch) | |
tree | 8f58c8620ffef0d350a5ec022feda492a96b179a /Documentation/EDID/1680x1050.S | |
parent | Input: atmel_mxt_ts - implement T44 message handling (diff) | |
parent | Linux 3.16-rc6 (diff) | |
download | linux-b9f12a5d97f652c77ef6803dccd0d40d1290f5be.tar.xz linux-b9f12a5d97f652c77ef6803dccd0d40d1290f5be.zip |
Merge tag 'v3.16-rc6' into next
Merge with mainline to bring in changes to MFD to allow merging
ipaq-micro-ts driver.
Diffstat (limited to 'Documentation/EDID/1680x1050.S')
-rw-r--r-- | Documentation/EDID/1680x1050.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/EDID/1680x1050.S b/Documentation/EDID/1680x1050.S index 96f67cafcf2e..b0d7c69282b4 100644 --- a/Documentation/EDID/1680x1050.S +++ b/Documentation/EDID/1680x1050.S @@ -36,7 +36,7 @@ #define DPI 96 #define VFREQ 60 /* Hz */ #define TIMING_NAME "Linux WSXGA" -#define ESTABLISHED_TIMINGS_BITS 0x00 /* none */ +/* No ESTABLISHED_TIMINGx_BITS */ #define HSYNC_POL 1 #define VSYNC_POL 1 #define CRC 0x26 |