Subject: linux-next: manual merge of the trivial tree with the drm tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 12 Feb 2010 15:12:23 +1100

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/gpu/drm/radeon/atombios.h between commit
e97bd974448ce90f8e4720499d84580bcd6a2f7a ("drm/radeon/kms: update
atombios.h to latest upstream") from the drm tree and commit
c9404c9c392d557a4687c4cbda022b03cb787ce9 ("Fix misspelling of "should"
and "shouldn't" in comments") from the trivial tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/gpu/drm/radeon/atombios.h
index 6732b5d,2a88029..0000000
--- a/drivers/gpu/drm/radeon/atombios.h
+++ b/drivers/gpu/drm/radeon/atombios.h
@@@ -2781,26 -2264,22 +2781,26 @@@ typedef struct _ATOM_LVDS_INFO_V1
  
  #define ATOM_LVDS_INFO_LAST  ATOM_LVDS_INFO_V12
  
 -typedef struct _ATOM_PATCH_RECORD_MODE {
 -	UCHAR ucRecordType;
 -	USHORT usHDisp;
 -	USHORT usVDisp;
 -} ATOM_PATCH_RECORD_MODE;
 +typedef struct  _ATOM_PATCH_RECORD_MODE
 +{
 +  UCHAR     ucRecordType;
 +  USHORT    usHDisp;
 +  USHORT    usVDisp;
 +}ATOM_PATCH_RECORD_MODE;
  
 -typedef struct _ATOM_LCD_RTS_RECORD {
 -	UCHAR ucRecordType;
 -	UCHAR ucRTSValue;
 -} ATOM_LCD_RTS_RECORD;
 +typedef struct  _ATOM_LCD_RTS_RECORD
 +{
 +  UCHAR     ucRecordType;
 +  UCHAR     ucRTSValue;
 +}ATOM_LCD_RTS_RECORD;
  
- //!! If the record below exits, it shoud always be the first record for easy use in command table!!! 
 -/* !! If the record below exits, it should always be the first record for easy use in command table!!! */
 -typedef struct _ATOM_LCD_MODE_CONTROL_CAP {
 -	UCHAR ucRecordType;
 -	USHORT usLCDCap;
 -} ATOM_LCD_MODE_CONTROL_CAP;
++//!! If the record below exits, it should always be the first record for easy use in command table!!! 
 +// The record below is only used when LVDS_Info is present. From ATOM_LVDS_INFO_V12, use ucLCDPanel_SpecialHandlingCap instead.
 +typedef struct  _ATOM_LCD_MODE_CONTROL_CAP
 +{
 +  UCHAR     ucRecordType;
 +  USHORT    usLCDCap;
 +}ATOM_LCD_MODE_CONTROL_CAP;
  
  #define LCD_MODE_CAP_BL_OFF                   1
  #define LCD_MODE_CAP_CRTC_OFF                 2