summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-02-12 15:34:02 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-02-12 15:34:02 +0100
commit5b189d909f9f0f94f2ab1aec5e3344cc385357f0 (patch)
treef83e93e153f773f25183b36918852de188e2bb07
parent3487b6cccff1251bd043bf6c9d83541a84654398 (diff)
parentd102d6ebd15348749927dfd9178faad0da6dd433 (diff)
downloaddevice_samsung_i9100-replicant-6.0.zip
device_samsung_i9100-replicant-6.0.tar.gz
device_samsung_i9100-replicant-6.0.tar.bz2
Merge branch 'cm-13.0' of https://github.com/LineageOS/android_device_samsung_i9100 into replicant-6.0replicant-6.0-beta-0002replicant-6.0
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
-rw-r--r--BoardConfig.mk2
-rw-r--r--lineage.dependencies (renamed from cm.dependencies)0
-rw-r--r--lineage.mk (renamed from cm.mk)0
3 files changed, 1 insertions, 1 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 32d0160..6e18a7e 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -29,7 +29,7 @@ BOARD_HAS_BLN := true
# Inline kernel building
TARGET_KERNEL_SOURCE := kernel/samsung/smdk4412
-TARGET_KERNEL_CONFIG := cyanogenmod_i9100_defconfig
+TARGET_KERNEL_CONFIG := lineageos_i9100_defconfig
TARGET_KERNEL_RECOVERY_CONFIG := cyanogenmod_i9100_recovery_defconfig
# assert
diff --git a/cm.dependencies b/lineage.dependencies
index 0ac91dc..0ac91dc 100644
--- a/cm.dependencies
+++ b/lineage.dependencies
diff --git a/cm.mk b/lineage.mk
index 32384e5..32384e5 100644
--- a/cm.mk
+++ b/lineage.mk