Skip to content

Commit 958ea68

Browse files
committed
Merge pull request #11 from Gu1-/odroid-3.0.y
odroid: Disable the exynos-mem block device on all ubuntu defconfigs
2 parents 95d5faf + 5337ab7 commit 958ea68

16 files changed

+5
-5
lines changed

arch/arm/configs/odroidq2_android_defconfig

100755100644
File mode changed.

arch/arm/configs/odroidq_android_defconfig

100755100644
File mode changed.

arch/arm/configs/odroidq_ubuntu_defconfig

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1474,7 +1474,7 @@ CONFIG_HW_RANDOM=y
14741474
# CONFIG_DCC_TTY is not set
14751475
# CONFIG_RAMOOPS is not set
14761476
CONFIG_S3C_MEM=y
1477-
CONFIG_EXYNOS_MEM=y
1477+
CONFIG_EXYNOS_MEM=n
14781478
CONFIG_I2C=y
14791479
CONFIG_I2C_BOARDINFO=y
14801480
CONFIG_I2C_COMPAT=y

arch/arm/configs/odroidu2_android_emmc_defconfig

100755100644
File mode changed.

arch/arm/configs/odroidu2_android_sdmmc_defconfig

100755100644
File mode changed.

arch/arm/configs/odroidu2_ubuntu_defconfig

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1522,7 +1522,7 @@ CONFIG_HW_RANDOM=y
15221522
# CONFIG_DCC_TTY is not set
15231523
CONFIG_RAMOOPS=m
15241524
CONFIG_S3C_MEM=y
1525-
CONFIG_EXYNOS_MEM=y
1525+
CONFIG_EXYNOS_MEM=n
15261526
CONFIG_I2C=y
15271527
CONFIG_I2C_BOARDINFO=y
15281528
CONFIG_I2C_COMPAT=y

arch/arm/configs/odroidu_android_emmc_defconfig

100755100644
File mode changed.

arch/arm/configs/odroidu_android_sdmmc_defconfig

100755100644
File mode changed.

arch/arm/configs/odroidu_ubuntu_defconfig

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1498,7 +1498,7 @@ CONFIG_HW_RANDOM=y
14981498
# CONFIG_DCC_TTY is not set
14991499
# CONFIG_RAMOOPS is not set
15001500
CONFIG_S3C_MEM=y
1501-
CONFIG_EXYNOS_MEM=y
1501+
CONFIG_EXYNOS_MEM=n
15021502
CONFIG_I2C=y
15031503
CONFIG_I2C_BOARDINFO=y
15041504
CONFIG_I2C_COMPAT=y

arch/arm/configs/odroidx2_android_emmc_defconfig

100755100644
File mode changed.

0 commit comments

Comments
 (0)