diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-08-04 09:10:38 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-08-04 09:10:38 -0400 |
| commit | d21872b3683ff37f73c68993749a6e6aeeaed265 (patch) | |
| tree | 0a84ae436325d6e646fe987516fb6bfccfff8a1c /arch/arm/plat-omap/Kconfig | |
| parent | 80690ccc41f01df6edfb6684006824d8edff189e (diff) | |
| parent | b3e69146f43fa351aa3cdffe2e76ec42174da612 (diff) | |
Merge branch 'v2.6.35-omap-mailbox-for-next' of git://gitorious.org/~doyu/lk/mainline into omap-for-linus
Conflicts:
arch/arm/mach-omap1/devices.c
Diffstat (limited to 'arch/arm/plat-omap/Kconfig')
| -rw-r--r-- | arch/arm/plat-omap/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig index e2ed952df23d..e39a417a368d 100644 --- a/arch/arm/plat-omap/Kconfig +++ b/arch/arm/plat-omap/Kconfig | |||
| @@ -88,6 +88,15 @@ config OMAP_MBOX_FWK | |||
| 88 | Say Y here if you want to use OMAP Mailbox framework support for | 88 | Say Y here if you want to use OMAP Mailbox framework support for |
| 89 | DSP, IVA1.0 and IVA2 in OMAP1/2/3. | 89 | DSP, IVA1.0 and IVA2 in OMAP1/2/3. |
| 90 | 90 | ||
| 91 | config OMAP_MBOX_KFIFO_SIZE | ||
| 92 | int "Mailbox kfifo default buffer size (bytes)" | ||
| 93 | depends on OMAP_MBOX_FWK | ||
| 94 | default 256 | ||
| 95 | help | ||
| 96 | Specify the default size of mailbox's kfifo buffers (bytes). | ||
| 97 | This can also be changed at runtime (via the mbox_kfifo_size | ||
| 98 | module parameter). | ||
| 99 | |||
| 91 | config OMAP_IOMMU | 100 | config OMAP_IOMMU |
| 92 | tristate | 101 | tristate |
| 93 | 102 | ||