--- a/open-src/kernel/i915/src/i915_drv.h	Wed Jun 01 13:37:37 2016 -0700
+++ b/open-src/kernel/i915/src/i915_drv.h	Mon Jun 13 13:54:24 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
  */
 
 /* i915_drv.h -- Private header for the I915 driver -*- linux-c -*-
@@ -1426,6 +1426,12 @@
 	struct i915_ctx_hang_stats hang_stats;
 };
 
+#if defined(__sun)
+/* These definitions conflict with those in x86_archext.h */
+#undef IS_IVYBRIDGE
+#undef IS_HASWELL
+#endif
+
 #define INTEL_INFO(dev)	(((struct drm_i915_private *) (dev)->dev_private)->info)
 
 #define IS_I830(dev)		((dev)->pci_device == 0x3577)