Merge commit 'main-jb-2012.08.03-B4' into t114-0806
[linux-2.6.git] / arch / arm / configs / tegra_p1852_gnu_linux_defconfig
index 243eaff..7e4f4ab 100644 (file)
@@ -35,6 +35,10 @@ CONFIG_TEGRA_P1852_TDM=y
 # CONFIG_TEGRA_CPU_DVFS is not set
 CONFIG_TEGRA_CLOCK_DEBUG_WRITE=y
 # CONFIG_TEGRA_MC_EARLY_ACK is not set
+# CONFIG_TEGRA_SE_ON_CBUS is not set
+CONFIG_TEGRA_CBUS_CLOCK_DIVIDER=1
+CONFIG_NON_ALIASED_COHERENT_MEM=y
+CONFIG_ARM_ERRATA_742230=y
 CONFIG_ARM_ERRATA_743622=y
 CONFIG_ARM_ERRATA_751472=y
 CONFIG_ARM_ERRATA_752520=y
@@ -134,7 +138,6 @@ CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
 CONFIG_REGULATOR_TPS6591X=y
-CONFIG_REGULATOR_TPS6236X=y
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 # CONFIG_TEGRA_AVP is not set
@@ -145,8 +148,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
 CONFIG_FB=y
 CONFIG_TEGRA_GRHOST=y
 CONFIG_TEGRA_DC=y
-CONFIG_TEGRA_DC_EXTENSIONS=y
-CONFIG_NVMAP_SEARCH_GLOBAL_HANDLES=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
@@ -166,12 +167,12 @@ CONFIG_USB_STORAGE=y
 CONFIG_USB_LIBUSUAL=y
 CONFIG_USB_TEGRA_OTG=y
 CONFIG_MMC=y
-CONFIG_MMC_BKOPS=y
 CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_EMBEDDED_SDIO=y
 CONFIG_MMC_PARANOID_SD_INIT=y
 # CONFIG_MMC_BLOCK_BOUNCE is not set
 CONFIG_MMC_BLOCK_DEFERRED_RESUME=y
+CONFIG_MMC_BKOPS=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_TEGRA=y
@@ -191,6 +192,8 @@ CONFIG_EXT3_FS_SECURITY=y
 CONFIG_EXT4_FS=y
 # CONFIG_DNOTIFY is not set
 CONFIG_FUSE_FS=y
+CONFIG_ISO9660_FS=y
+CONFIG_JOLIET=y
 CONFIG_VFAT_FS=y
 CONFIG_TMPFS=y
 # CONFIG_MISC_FILESYSTEMS is not set