... for allowing more cleanups of hda_intel.c driver-caps where both upstream and for-next contain the changes.