diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-11-12 15:28:39 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-11-12 15:28:39 +0100 |
| commit | f987e832a9e79d2ce8009a5ea9c7b677624b3b30 (patch) | |
| tree | 0dd09a5e6b4c60ee0a9916907dfc2cda83f3e496 /arch/arm/configs/tegra_android_defconfig | |
| parent | f737b7f46a72c099cf8ac88baff02fbf61b1a47c (diff) | |
| parent | fc993d9bc48f772133d8cd156c67c296477db070 (diff) | |
Merge branch 'l4t/l4t-r16-r2' into colibri
Conflicts:
arch/arm/mach-tegra/tegra3_usb_phy.c
arch/arm/mach-tegra/usb_phy.c
drivers/usb/gadget/tegra_udc.c
drivers/usb/otg/Makefile
drivers/video/tegra/fb.c
sound/soc/tegra/tegra_pcm.c
Diffstat (limited to 'arch/arm/configs/tegra_android_defconfig')
| -rw-r--r-- | arch/arm/configs/tegra_android_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/tegra_android_defconfig b/arch/arm/configs/tegra_android_defconfig index eb6abec87b70..fb5ae2a1d999 100644 --- a/arch/arm/configs/tegra_android_defconfig +++ b/arch/arm/configs/tegra_android_defconfig @@ -48,6 +48,7 @@ CONFIG_PREEMPT=y CONFIG_AEABI=y # CONFIG_OABI_COMPAT is not set CONFIG_HIGHMEM=y +CONFIG_USE_OF=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CPU_FREQ=y @@ -172,6 +173,7 @@ CONFIG_CFG80211=y CONFIG_RFKILL=y CONFIG_RFKILL_GPIO=y # CONFIG_FIRMWARE_IN_KERNEL is not set +CONFIG_PROC_DEVICETREE=y CONFIG_BLK_DEV_LOOP=y CONFIG_MISC_DEVICES=y CONFIG_AD525X_DPOT=y |