fix conflict mistake

2021-12-30 22:18:01 +00:00 · 2021-12-30 22:18:01 +00:00 · 85e002d319
commit 85e002d319
parent d5d74632cc
1 changed files with 0 additions and 2 deletions
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@ -207,8 +207,6 @@ else
        COMMON_VPATH += $(DRIVER_PATH)/eeprom
        SRC += eeprom_driver.c eeprom_transient.c
      endif
-	else ifeq ($(PLATFORM),PICO_SDK)
-      SRC += $(PLATFORM_COMMON_DIR)/eeprom.c
    else ifeq ($(PLATFORM),ARM_ATSAM)
      # arm_atsam EEPROM
      OPT_DEFS += -DEEPROM_SAMD