diff options
| author | Keith Packard | 2011-10-20 22:40:33 +0200 |
|---|---|---|
| committer | Keith Packard | 2011-10-20 23:10:07 +0200 |
| commit | 86a3073e480c522f12e5291a462f68f6ee30aee3 (patch) | |
| tree | 5804f9d944084ff5245d07e8340779a4ecd52f9b /drivers/gpu/drm/i915/intel_bios.h | |
| parent | Merge branch 'drm-intel-fixes' into drm-intel-next (diff) | |
| parent | drm/i915: No need to wait for eDP power off delay if panel is on (diff) | |
| download | kernel-qcow2-linux-86a3073e480c522f12e5291a462f68f6ee30aee3.tar.gz kernel-qcow2-linux-86a3073e480c522f12e5291a462f68f6ee30aee3.tar.xz kernel-qcow2-linux-86a3073e480c522f12e5291a462f68f6ee30aee3.zip | |
Merge branch 'edp-training-fixes' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/intel_dp.c
Just whitespace change conflicts
Diffstat (limited to 'drivers/gpu/drm/i915/intel_bios.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_bios.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_bios.h b/drivers/gpu/drm/i915/intel_bios.h index c2e38feb7899..dc20d6df1691 100644 --- a/drivers/gpu/drm/i915/intel_bios.h +++ b/drivers/gpu/drm/i915/intel_bios.h @@ -1,5 +1,5 @@ /* - * Copyright © 2006 Intel Corporation + * Copyright © 2006 Intel Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -446,11 +446,11 @@ struct bdb_driver_features { #define EDP_VSWING_1_2V 3 struct edp_power_seq { - u16 t3; - u16 t7; + u16 t1_t3; + u16 t8; u16 t9; u16 t10; - u16 t12; + u16 t11_t12; } __attribute__ ((packed)); struct edp_link_params { |