Merge pull request #11 from Gu1-/odroid-3.0.y

odroid: Disable the exynos-mem block device on all ubuntu defconfigs
hardkernel · Jan 16, 2013 · 958ea68 · 958ea68
2 parents 95d5faf + 5337ab7
commit 958ea68
Show file tree

Hide file tree

Showing 16 changed files with 5 additions and 5 deletions.
diff --git a/arch/arm/configs/odroidq2_android_defconfig b/arch/arm/configs/odroidq2_android_defconfig
diff --git a/arch/arm/configs/odroidq_android_defconfig b/arch/arm/configs/odroidq_android_defconfig
diff --git a/arch/arm/configs/odroidq_ubuntu_defconfig b/arch/arm/configs/odroidq_ubuntu_defconfig
@@ -1474,7 +1474,7 @@ CONFIG_HW_RANDOM=y
 # CONFIG_DCC_TTY is not set
 # CONFIG_RAMOOPS is not set
 CONFIG_S3C_MEM=y
-CONFIG_EXYNOS_MEM=y
+CONFIG_EXYNOS_MEM=n
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y

diff --git a/arch/arm/configs/odroidu2_android_emmc_defconfig b/arch/arm/configs/odroidu2_android_emmc_defconfig
diff --git a/arch/arm/configs/odroidu2_android_sdmmc_defconfig b/arch/arm/configs/odroidu2_android_sdmmc_defconfig
diff --git a/arch/arm/configs/odroidu2_ubuntu_defconfig b/arch/arm/configs/odroidu2_ubuntu_defconfig
@@ -1522,7 +1522,7 @@ CONFIG_HW_RANDOM=y
 # CONFIG_DCC_TTY is not set
 CONFIG_RAMOOPS=m
 CONFIG_S3C_MEM=y
-CONFIG_EXYNOS_MEM=y
+CONFIG_EXYNOS_MEM=n
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y

diff --git a/arch/arm/configs/odroidu_android_emmc_defconfig b/arch/arm/configs/odroidu_android_emmc_defconfig
diff --git a/arch/arm/configs/odroidu_android_sdmmc_defconfig b/arch/arm/configs/odroidu_android_sdmmc_defconfig
diff --git a/arch/arm/configs/odroidu_ubuntu_defconfig b/arch/arm/configs/odroidu_ubuntu_defconfig
@@ -1498,7 +1498,7 @@ CONFIG_HW_RANDOM=y
 # CONFIG_DCC_TTY is not set
 # CONFIG_RAMOOPS is not set
 CONFIG_S3C_MEM=y
-CONFIG_EXYNOS_MEM=y
+CONFIG_EXYNOS_MEM=n
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y

diff --git a/arch/arm/configs/odroidx2_android_emmc_defconfig b/arch/arm/configs/odroidx2_android_emmc_defconfig
diff --git a/arch/arm/configs/odroidx2_android_sdmmc_defconfig b/arch/arm/configs/odroidx2_android_sdmmc_defconfig
diff --git a/arch/arm/configs/odroidx2_ubuntu_defconfig b/arch/arm/configs/odroidx2_ubuntu_defconfig
@@ -1521,7 +1521,7 @@ CONFIG_HW_RANDOM=y
 # CONFIG_DCC_TTY is not set
 CONFIG_RAMOOPS=m
 CONFIG_S3C_MEM=y
-CONFIG_EXYNOS_MEM=y
+CONFIG_EXYNOS_MEM=n
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y

diff --git a/arch/arm/configs/odroidx_android_42Inch_demo_defconfig b/arch/arm/configs/odroidx_android_42Inch_demo_defconfig
diff --git a/arch/arm/configs/odroidx_android_emmc_defconfig b/arch/arm/configs/odroidx_android_emmc_defconfig
diff --git a/arch/arm/configs/odroidx_android_sdmmc_defconfig b/arch/arm/configs/odroidx_android_sdmmc_defconfig
diff --git a/arch/arm/configs/odroidx_ubuntu_defconfig b/arch/arm/configs/odroidx_ubuntu_defconfig
@@ -1521,7 +1521,7 @@ CONFIG_HW_RANDOM=y
 # CONFIG_DCC_TTY is not set
 CONFIG_RAMOOPS=m
 CONFIG_S3C_MEM=y
-CONFIG_EXYNOS_MEM=y
+CONFIG_EXYNOS_MEM=n
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y