diff options
| author | Yu-Huan Hsu <yhsu@nvidia.com> | 2010-06-25 12:35:14 -0700 |
|---|---|---|
| committer | Gary King <gking@nvidia.com> | 2010-06-25 19:26:55 -0700 |
| commit | 5522241d0a1be00eb8648c184c5efb46b54e1c42 (patch) | |
| tree | 65d6012899f50d03af08609ac4d6958858a2c498 /arch | |
| parent | 55ee12dc4ad24714f5913b4a4a6e8a73cfe55516 (diff) | |
[ARM] whistler : Enable USB_SUSPEND
Bug 700516
Change-Id: I14c6c679fcc0c14425ea9967c6886c8aead2580e
Reviewed-on: http://git-master/r/3222
Tested-by: Yu-Huan Hsu <yhsu@nvidia.com>
Reviewed-by: Gary King <gking@nvidia.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/tegra_whistler_gnu_linux_defconfig | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/arch/arm/configs/tegra_whistler_gnu_linux_defconfig b/arch/arm/configs/tegra_whistler_gnu_linux_defconfig index 588b0f14dd1e..194f52f8d7f1 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 -# Thu Jun 17 18:35:54 2010 +# Fri Jun 25 12:06:14 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -21,6 +21,7 @@ CONFIG_ARCH_HAS_DEFAULT_IDLE=y CONFIG_ARCH_HAS_CPUFREQ=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ZONE_DMA=y CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y CONFIG_ARCH_PROVIDES_UDELAY=y CONFIG_VECTORS_BASE=0xffff0000 @@ -204,6 +205,8 @@ CONFIG_ARCH_TEGRA=y # CONFIG_ARCH_TEGRA_2x_SOC=y CONFIG_MACH_TEGRA_GENERIC=y +CONFIG_MACH_HARMONY=y +CONFIG_MACH_VENTANA=y CONFIG_TEGRA_ODM_KIT=y CONFIG_TEGRA_DEBUG_UART_NONE=y # CONFIG_TEGRA_DEBUG_UARTA is not set @@ -222,8 +225,9 @@ CONFIG_TEGRA_FUSE=y CONFIG_TEGRA_AES=y CONFIG_TEGRA_AES_USER=y CONFIG_TEGRA_USB_CHARGE=y -# CONFIG_TEGRA_USB_VBUS_DETECT_BY_PMU is not set +CONFIG_TEGRA_USB_VBUS_DETECT_BY_PMU=y # CONFIG_TEGRA_ODM_HARMONY is not set +# CONFIG_TEGRA_ODM_VENTANA is not set CONFIG_TEGRA_ODM_WHISTLER=y # @@ -263,6 +267,7 @@ CONFIG_TEGRA_ERRATA_657451=y # CONFIG_ARM_ERRATA_458693 is not set # CONFIG_ARM_ERRATA_460075 is not set CONFIG_ARM_GIC=y +CONFIG_DMABOUNCE=y CONFIG_COMMON_CLKDEV=y # @@ -309,7 +314,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_PHYS_ADDR_T_64BIT is not set -CONFIG_ZONE_DMA_FLAG=0 +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y CONFIG_HAVE_MLOCK=y CONFIG_HAVE_MLOCKED_PAGE_BIT=y @@ -1182,7 +1188,7 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_DEVICEFS=y CONFIG_USB_DEVICE_CLASS=y # CONFIG_USB_DYNAMIC_MINORS is not set -# CONFIG_USB_SUSPEND is not set +CONFIG_USB_SUSPEND=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OTG_BLACKLIST_HUB is not set |