From patchwork Sun Feb 13 19:28:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Decky X-Patchwork-Id: 553331 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1DJwVo6004063 for ; Sun, 13 Feb 2011 19:58:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754762Ab1BMT6b (ORCPT ); Sun, 13 Feb 2011 14:58:31 -0500 Received: from modry.cz ([217.11.254.86]:40055 "EHLO modry.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754751Ab1BMT6b (ORCPT ); Sun, 13 Feb 2011 14:58:31 -0500 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sun, 13 Feb 2011 19:58:40 +0000 (UTC) X-Greylist: delayed 1787 seconds by postgrey-1.27 at vger.kernel.org; Sun, 13 Feb 2011 14:58:30 EST Received: from ares.decky.cz ([62.24.74.250]) by modry.cz with esmtpsa (TLSv1:CAMELLIA256-SHA:256) (Exim 4.69) (envelope-from ) id 1Pohcf-0003T2-05; Sun, 13 Feb 2011 20:28:41 +0100 Message-ID: <4D5830E8.50900@decky.cz> Date: Sun, 13 Feb 2011 20:28:40 +0100 From: Martin Decky User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.13) Gecko/20101209 Fedora/3.1.7-0.35.b3pre.fc14 Thunderbird/3.1.7 MIME-Version: 1.0 To: linux-fbdev@vger.kernel.org, Paul Mundt Subject: [PATCH] Fix EDID macros H_SYNC_WIDTH and H_SYNC_OFFSET X-Spam-Score: -2.5 X-Spam-Level: -- Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org diff -Naurp fbdev-2.6.orig/drivers/video/edid.h fbdev-2.6/drivers/video/edid.h --- fbdev-2.6.orig/drivers/video/edid.h 2011-02-13 19:45:22.000000000 +0100 +++ fbdev-2.6/drivers/video/edid.h 2011-02-13 19:56:02.080350929 +0100 @@ -101,8 +101,8 @@ #define V_SYNC_WIDTH COMBINE_HI_4LO( V_SYNC_WIDTH_HI, V_SYNC_WIDTH_LO ) #define V_SYNC_OFFSET COMBINE_HI_4LO( V_SYNC_OFFSET_HI, V_SYNC_OFFSET_LO ) -#define H_SYNC_WIDTH COMBINE_HI_4LO( H_SYNC_WIDTH_HI, H_SYNC_WIDTH_LO ) -#define H_SYNC_OFFSET COMBINE_HI_4LO( H_SYNC_OFFSET_HI, H_SYNC_OFFSET_LO ) +#define H_SYNC_WIDTH COMBINE_HI_8LO( H_SYNC_WIDTH_HI, H_SYNC_WIDTH_LO ) +#define H_SYNC_OFFSET COMBINE_HI_8LO( H_SYNC_OFFSET_HI, H_SYNC_OFFSET_LO ) #define H_SIZE_LO (unsigned)block[ 12 ] #define V_SIZE_LO (unsigned)block[ 13 ]