linux-next: build failure after merge of the drm-intel-fixes tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi all,

After merging the drm-intel-fixes tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/gpu/drm/i915/intel_display.c: In function 'has_bogus_dpll_config':
drivers/gpu/drm/i915/intel_display.c:15432:27: error: macro "IS_GEN" requires 3 arguments, but only 2 given
  return IS_GEN(dev_priv, 6) &&
                           ^

Caused by commit

  a49a17226feb ("drm/i915: Try to sanitize bogus DPLL state left over by broken SNB BIOSen")

It seems this was cherry-picked incorrectly :-(

I have reverted that commit for today.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpXiyxrHiZnp.pgp
Description: OpenPGP digital signature