diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-25 14:31:35 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-25 14:31:35 -0400 |
| commit | 8937b7349ca9e25a02b2a72ccb7fba404ddedc5b (patch) | |
| tree | 434ffe23d318f8af55850a26c3431ce8b82ab6f4 /arch/arm/plat-omap/Kconfig | |
| parent | 997302259f386bca8fe1db67c50296ca426c438f (diff) | |
| parent | ffe7f95bb1a4d1e9ca5d252445dc38476e1a208e (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel
Diffstat (limited to 'arch/arm/plat-omap/Kconfig')
| -rw-r--r-- | arch/arm/plat-omap/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig index e25e1ac64fc1..9dd68fafb374 100644 --- a/arch/arm/plat-omap/Kconfig +++ b/arch/arm/plat-omap/Kconfig | |||
| @@ -107,6 +107,14 @@ config OMAP_MCBSP | |||
| 107 | Say Y here if you want support for the OMAP Multichannel | 107 | Say Y here if you want support for the OMAP Multichannel |
| 108 | Buffered Serial Port. | 108 | Buffered Serial Port. |
| 109 | 109 | ||
| 110 | config OMAP_MBOX_FWK | ||
| 111 | tristate "Mailbox framework support" | ||
| 112 | depends on ARCH_OMAP | ||
| 113 | default n | ||
| 114 | help | ||
| 115 | Say Y here if you want to use OMAP Mailbox framework support for | ||
| 116 | DSP, IVA1.0 and IVA2 in OMAP1/2/3. | ||
| 117 | |||
| 110 | choice | 118 | choice |
| 111 | prompt "System timer" | 119 | prompt "System timer" |
| 112 | default OMAP_MPU_TIMER | 120 | default OMAP_MPU_TIMER |