diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-23 19:01:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-23 19:01:01 -0400 |
| commit | b85c14fb833e6da127188aa61b0a2aec8111bf59 (patch) | |
| tree | 059a0f91819a8e4f6dc26d75b6ee6e42d29e4fbe /arch/arm/mach-omap2/Kconfig | |
| parent | ce447f34a7696268d1c7a7c44a0d5ef7a8176491 (diff) | |
| parent | 913bdf1217f40c5e68c6b09f299177e5cd9629bd (diff) | |
Merge tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull non-critical arm-soc bug fixes from Arnd Bergmann:
"These were submitted as bug fixes before v3.5 but not considered
important enough to be included in it."
* tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (29 commits)
ARM:vt8500: Convert to use .restart and remove arch_reset()
ARM: davinci: da8xx: fix interrupt handling
ARM: OMAP2+: fix CONFIG_CPU_IDLE dependency on CONFIG_PM
ARM: mxs/tx28: fix odd include
ARM: OMAP: remove unused cpu detection macros
ARM: OMAP: fix typos related to OMAP330
ARM: OMAP7XX: Remove omap730.h and omap850.h
ARM: OMAP2+: fix naming collision of variable nr_irqs
ARM: OMAP: omap2plus_defconfig: Enable EXT4 support
ARM: OMAP depends on MMU
arm: omap3: am35x: Set proper powerdomain states
ARM: OMAP AM35x: clockdomain data: Fix clockdomain dependencies
ARM: OMAP AM35x: EMAC/MDIO integration: Add Davinci EMAC/MDIO hwmod support
ARM: OMAP: AM35xx: fix UART4 softreset
ARM: OMAP AM35xx: clock and hwmod data: fix UART4 data
ARM: OMAP AM35xx: clock and hwmod data: fix AM35xx HSOTGUSB hwmod
ARM: OMAP: Fix dts files w/ status property: "disable" -> "disabled"
ARM: OMAP: beagle: Set USB Host Port 1 to OMAP_USBHS_PORT_MODE_UNUSED
ARM: OMAP2: twl-common: Fix compiler warning
ARM: OMAP: fix the ads7846 init code
...
Diffstat (limited to 'arch/arm/mach-omap2/Kconfig')
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 4cf5142f22cc..2f4ace6f91d1 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig | |||
| @@ -35,6 +35,7 @@ config ARCH_OMAP3 | |||
| 35 | select CPU_V7 | 35 | select CPU_V7 |
| 36 | select USB_ARCH_HAS_EHCI if USB_SUPPORT | 36 | select USB_ARCH_HAS_EHCI if USB_SUPPORT |
| 37 | select ARCH_HAS_OPP | 37 | select ARCH_HAS_OPP |
| 38 | select PM_RUNTIME if CPU_IDLE | ||
| 38 | select PM_OPP if PM | 39 | select PM_OPP if PM |
| 39 | select ARM_CPU_SUSPEND if PM | 40 | select ARM_CPU_SUSPEND if PM |
| 40 | select MULTI_IRQ_HANDLER | 41 | select MULTI_IRQ_HANDLER |
| @@ -52,6 +53,7 @@ config ARCH_OMAP4 | |||
| 52 | select PL310_ERRATA_727915 | 53 | select PL310_ERRATA_727915 |
| 53 | select ARM_ERRATA_720789 | 54 | select ARM_ERRATA_720789 |
| 54 | select ARCH_HAS_OPP | 55 | select ARCH_HAS_OPP |
| 56 | select PM_RUNTIME if CPU_IDLE | ||
| 55 | select PM_OPP if PM | 57 | select PM_OPP if PM |
| 56 | select USB_ARCH_HAS_EHCI if USB_SUPPORT | 58 | select USB_ARCH_HAS_EHCI if USB_SUPPORT |
| 57 | select ARM_CPU_SUSPEND if PM | 59 | select ARM_CPU_SUSPEND if PM |