Comment 2 for bug 1860401

Test build failed after 3 patches cherry-pick from mainline.

/home/ubuntu/ubuntu-focal/drivers/mtd/spi-nor/spi-nor.c: In function ‘st_micron_set_default_init’:
/home/ubuntu/ubuntu-focal/drivers/mtd/spi-nor/spi-nor.c:4393:17: error: ‘SNOR_F_HAS_16BIT_SR’ undeclared (first use in this function); did you mean ‘SNOR_F_HAS_4BAIT’?
  nor->flags &= ~SNOR_F_HAS_16BIT_SR;
                 ^~~~~~~~~~~~~~~~~~~
                 SNOR_F_HAS_4BAIT
/home/ubuntu/ubuntu-focal/drivers/mtd/spi-nor/spi-nor.c:4393:17: note: each undeclared identifier is reported only once for each function it appears in