mb/intel/icelake_rvp: Remove nested variant header references

Change-Id: I11b2d75dc0d4ff180b03324e5ce3d5590c8169a5
Signed-off-by: Aamir Bohra <aamir.bohra@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37356
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Rizwan Qureshi <rizwan.qureshi@intel.com>

src/mainboard/intel/icelake_rvp/mainboard.c

@@ -14,11 +14,11 @@
  */
 
 #include <arch/acpi.h>
+#include <baseboard/gpio.h>
 #include <baseboard/variants.h>
 #include <device/device.h>
 #include <soc/gpio.h>
 #include <vendorcode/google/chromeos/chromeos.h>
-#include <variant/gpio.h>
 
 static void mainboard_init(void *chip_info)
 {