aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915/intel_bios.h
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2011-10-20 13:40:33 -0700
committerKeith Packard <keithp@keithp.com>2011-10-20 14:10:07 -0700
commit86a3073e480c522f12e5291a462f68f6ee30aee3 (patch)
tree5804f9d944084ff5245d07e8340779a4ecd52f9b /drivers/gpu/drm/i915/intel_bios.h
parent0ac225e56997ef89f46eb51b02799a685b78f214 (diff)
parent32ce697c53f41290c3a2d3807b521b0fe4f42d2a (diff)
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.h8
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 c2e38feb789..dc20d6df169 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 {