diff options
| author | Chris Zankel <chris@zankel.net> | 2013-07-08 01:10:26 -0700 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2013-07-08 01:10:26 -0700 |
| commit | 033d777f548645c3a906b73eef5d665aeee55092 (patch) | |
| tree | 707dd7757ed59882fb1ecaf73313c325fa20dec8 /arch/arm/configs/omap2plus_defconfig | |
| parent | fd95ee7380ae973c6f11b897af6ef9d253a1df9e (diff) | |
| parent | 73b0cd674ccc64c921e25bd7154f26d342116539 (diff) | |
Merge branch 'timers-core-for-linus' of https://git.kernel.org/cgit/linux/kernel/git/tip/tip into tst5
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 |