| @@ -394,29 +394,27 @@ enum intel_sbi_destination { | | | @@ -394,29 +394,27 @@ enum intel_sbi_destination { |
394 | | | 394 | |
395 | #define QUIRK_PIPEA_FORCE (1<<0) | | 395 | #define QUIRK_PIPEA_FORCE (1<<0) |
396 | #define QUIRK_LVDS_SSC_DISABLE (1<<1) | | 396 | #define QUIRK_LVDS_SSC_DISABLE (1<<1) |
397 | #define QUIRK_INVERT_BRIGHTNESS (1<<2) | | 397 | #define QUIRK_INVERT_BRIGHTNESS (1<<2) |
398 | | | 398 | |
399 | struct intel_fbdev; | | 399 | struct intel_fbdev; |
400 | struct intel_fbc_work; | | 400 | struct intel_fbc_work; |
401 | | | 401 | |
402 | struct intel_gmbus { | | 402 | struct intel_gmbus { |
403 | struct i2c_adapter adapter; | | 403 | struct i2c_adapter adapter; |
404 | u32 force_bit; | | 404 | u32 force_bit; |
405 | u32 reg0; | | 405 | u32 reg0; |
406 | u32 gpio_reg; | | 406 | u32 gpio_reg; |
407 | #ifndef __NetBSD__ /* XXX i2c */ | | | |
408 | struct i2c_algo_bit_data bit_algo; | | 407 | struct i2c_algo_bit_data bit_algo; |
409 | #endif | | | |
410 | struct drm_i915_private *dev_priv; | | 408 | struct drm_i915_private *dev_priv; |
411 | }; | | 409 | }; |
412 | | | 410 | |
413 | struct i915_suspend_saved_registers { | | 411 | struct i915_suspend_saved_registers { |
414 | u8 saveLBB; | | 412 | u8 saveLBB; |
415 | u32 saveDSPACNTR; | | 413 | u32 saveDSPACNTR; |
416 | u32 saveDSPBCNTR; | | 414 | u32 saveDSPBCNTR; |
417 | u32 saveDSPARB; | | 415 | u32 saveDSPARB; |
418 | u32 savePIPEACONF; | | 416 | u32 savePIPEACONF; |
419 | u32 savePIPEBCONF; | | 417 | u32 savePIPEBCONF; |
420 | u32 savePIPEASRC; | | 418 | u32 savePIPEASRC; |
421 | u32 savePIPEBSRC; | | 419 | u32 savePIPEBSRC; |
422 | u32 saveFPA0; | | 420 | u32 saveFPA0; |