[intel] Merge intel_ioctl.h.  Not sure how this slipped by in the .c merge.
2 files changed