add a patch to revert recent breakage in the intel cfi flash driver (fixes #1140)