diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-18 21:03:30 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-18 21:05:48 +0200 |
| commit | b3f288de7c8add67a3364e989b865b6537838662 (patch) | |
| tree | 389c80ae471e4e24f25e6c38862a89ee5d833d86 /arch/arm/configs/omap2plus_defconfig | |
| parent | Merge branch 'ja-nommu-for-rmk-v2' of git://linux-arm.org/linux-ja into devel... (diff) | |
| parent | ARM: mm: Transparent huge page support for LPAE systems. (diff) | |
| download | linux-b3f288de7c8add67a3364e989b865b6537838662.tar.xz linux-b3f288de7c8add67a3364e989b865b6537838662.zip | |
Merge branch 'for-rmk/hugepages' of git://git.linaro.org/people/stevecapper/linux into devel-stable
These changes bring both HugeTLB support and Transparent HugePage
(THP) support to ARM. Only long descriptors (LPAE) are supported
in this series.
The code has been tested on an Arndale board (Exynos 5250).
Diffstat (limited to 'arch/arm/configs/omap2plus_defconfig')
| -rw-r--r-- | arch/arm/configs/omap2plus_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index c1ef64bc5abd..abbe31937c65 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -20,6 +20,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y # CONFIG_BLK_DEV_BSG is not set +CONFIG_ARCH_MULTI_V6=y CONFIG_ARCH_OMAP2PLUS=y CONFIG_OMAP_RESET_CLOCKS=y CONFIG_OMAP_MUX_DEBUG=y @@ -204,7 +205,6 @@ CONFIG_USB=y CONFIG_USB_DEBUG=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_DEVICEFS=y -CONFIG_USB_SUSPEND=y CONFIG_USB_MON=y CONFIG_USB_WDM=y CONFIG_USB_STORAGE=y |