summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvdumpa <vdumpa@nvidia.com>2010-07-28 16:06:48 -0700
committerGary King <gking@nvidia.com>2010-07-28 17:01:57 -0700
commit78ea3763bef4ec4bf87eabf7a6b66b3282e4d372 (patch)
tree088da4b5656ebc390c0e95cb64ab91a63ce3a95f
parentc73596cdb7b88c0abd5802c28703c2385fc40aee (diff)
[arm/tegra] Enabled MMC_BLOCK_DEVICE_NUMBERING.
Enabled MMC_BLOCK_DEVICE_NUMBERING flag, which enables naming mmcblk%d after sdhci controller instance number. Change-Id: Ie12974143dda09d7ce02db37d2b79c4a43da8977 Reviewed-on: http://git-master.nvidia.com/r/4511 Reviewed-by: Jonathan Mayo <jmayo@nvidia.com> Tested-by: Krishna Reddy <vdumpa@nvidia.com> Reviewed-by: Gary King <gking@nvidia.com>
-rw-r--r--arch/arm/configs/tegra_harmony_android_defconfig4
-rw-r--r--arch/arm/configs/tegra_harmony_gnu_linux_defconfig3
-rwxr-xr-xarch/arm/configs/tegra_ventana_android_defconfig4
-rw-r--r--arch/arm/configs/tegra_whistler_android_defconfig3
-rw-r--r--arch/arm/configs/tegra_whistler_gnu_linux_defconfig3
5 files changed, 12 insertions, 5 deletions
diff --git a/arch/arm/configs/tegra_harmony_android_defconfig b/arch/arm/configs/tegra_harmony_android_defconfig
index 46f5e20893cf..c4dcf77001d7 100644
--- a/arch/arm/configs/tegra_harmony_android_defconfig
+++ b/arch/arm/configs/tegra_harmony_android_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.32.9
-# Wed Jun 23 14:37:19 2010
+# Wed Jul 28 12:13:30 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -236,6 +236,7 @@ CONFIG_TEGRA_AES_USER=y
# CONFIG_TEGRA_LP2POLICY_PERSIST_IN_LC is not set
CONFIG_TEGRA_LP2POLICY_IGNORE_LC=y
CONFIG_TEGRA_ODM_HARMONY=y
+# CONFIG_TEGRA_ODM_VENTANA is not set
# CONFIG_TEGRA_ODM_WHISTLER is not set
#
@@ -1594,6 +1595,7 @@ CONFIG_MMC_UNSAFE_RESUME=y
CONFIG_MMC_BLOCK=y
CONFIG_MMC_BLOCK_BOUNCE=y
# CONFIG_MMC_BLOCK_DEFERRED_RESUME is not set
+CONFIG_MMC_BLOCK_DEVICE_NUMBERING=y
# CONFIG_SDIO_UART is not set
# CONFIG_MMC_TEST is not set
diff --git a/arch/arm/configs/tegra_harmony_gnu_linux_defconfig b/arch/arm/configs/tegra_harmony_gnu_linux_defconfig
index c13d0464262e..aa5a9c250557 100644
--- a/arch/arm/configs/tegra_harmony_gnu_linux_defconfig
+++ b/arch/arm/configs/tegra_harmony_gnu_linux_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.32.9
-# Wed Jul 21 11:03:19 2010
+# Wed Jul 28 12:14:12 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1504,6 +1504,7 @@ CONFIG_MMC_UNSAFE_RESUME=y
CONFIG_MMC_BLOCK=y
CONFIG_MMC_BLOCK_BOUNCE=y
# CONFIG_MMC_BLOCK_DEFERRED_RESUME is not set
+CONFIG_MMC_BLOCK_DEVICE_NUMBERING=y
# CONFIG_SDIO_UART is not set
# CONFIG_MMC_TEST is not set
diff --git a/arch/arm/configs/tegra_ventana_android_defconfig b/arch/arm/configs/tegra_ventana_android_defconfig
index 5a5ab0a3efa0..fd2fc1697254 100755
--- a/arch/arm/configs/tegra_ventana_android_defconfig
+++ b/arch/arm/configs/tegra_ventana_android_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.32.9
-# Mon Jul 19 08:32:39 2010
+# Wed Jul 28 12:15:04 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1296,6 +1296,7 @@ CONFIG_MMC_UNSAFE_RESUME=y
CONFIG_MMC_BLOCK=y
CONFIG_MMC_BLOCK_BOUNCE=y
# CONFIG_MMC_BLOCK_DEFERRED_RESUME is not set
+CONFIG_MMC_BLOCK_DEVICE_NUMBERING=y
# CONFIG_SDIO_UART is not set
# CONFIG_MMC_TEST is not set
@@ -1340,6 +1341,7 @@ CONFIG_RTC_INTF_ALARM_DEV=y
# CONFIG_RTC_DRV_ISL1208 is not set
# CONFIG_RTC_DRV_X1205 is not set
CONFIG_RTC_DRV_TEGRA_ODM=y
+CONFIG_RTC_DRV_TEGRA=y
# CONFIG_RTC_DRV_PCF8563 is not set
# CONFIG_RTC_DRV_PCF8583 is not set
# CONFIG_RTC_DRV_M41T80 is not set
diff --git a/arch/arm/configs/tegra_whistler_android_defconfig b/arch/arm/configs/tegra_whistler_android_defconfig
index acb23fad3aa5..6ed4b376de64 100644
--- a/arch/arm/configs/tegra_whistler_android_defconfig
+++ b/arch/arm/configs/tegra_whistler_android_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.32.9
-# Tue Jul 27 13:23:26 2010
+# Wed Jul 28 12:11:42 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1456,6 +1456,7 @@ CONFIG_MMC_UNSAFE_RESUME=y
CONFIG_MMC_BLOCK=y
CONFIG_MMC_BLOCK_BOUNCE=y
# CONFIG_MMC_BLOCK_DEFERRED_RESUME is not set
+CONFIG_MMC_BLOCK_DEVICE_NUMBERING=y
# CONFIG_SDIO_UART is not set
# CONFIG_MMC_TEST is not set
diff --git a/arch/arm/configs/tegra_whistler_gnu_linux_defconfig b/arch/arm/configs/tegra_whistler_gnu_linux_defconfig
index d7bfec6efccb..06f299d6e40c 100644
--- a/arch/arm/configs/tegra_whistler_gnu_linux_defconfig
+++ b/arch/arm/configs/tegra_whistler_gnu_linux_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.32.9
-# Tue Jul 27 13:23:26 2010
+# Wed Jul 28 12:12:50 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1347,6 +1347,7 @@ CONFIG_MMC_UNSAFE_RESUME=y
CONFIG_MMC_BLOCK=y
CONFIG_MMC_BLOCK_BOUNCE=y
# CONFIG_MMC_BLOCK_DEFERRED_RESUME is not set
+CONFIG_MMC_BLOCK_DEVICE_NUMBERING=y
# CONFIG_SDIO_UART is not set
# CONFIG_MMC_TEST is not set