diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-06-17 10:51:54 (GMT) |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-06-17 10:51:54 (GMT) |
| commit | d2e993289cc5f1780ce74188e3a8d2b404748397 (patch) | |
| tree | 02be072bd60241b604e2295addf78e817c47e3ca /arch/arm/configs | |
| parent | 317ddd256b9c24b0d78fa8018f80f1e495481a10 (diff) | |
| parent | c869c75c16b3d1ffcf64fb2fd63ba0c4a369071c (diff) | |
| download | linux-fsl-qoriq-d2e993289cc5f1780ce74188e3a8d2b404748397.tar.xz | |
Merge tag 'omap-mailbox-for-v3.11' of git://github.com/sumananna/mailbox into omap-for-v3.11/mailbox
Move OMAP Mailbox framework to drivers
The OMAP Mailbox driver framework is moved out of arch/arm folder
into drivers/mailbox folder, to re-enable building it and also serve
as a baseline for adapting to the new mailbox driver framework. The
changes mainly contain:
- a minor bug fix and cleanup of mach-specific mailbox code
- remove any header dependencies from plat-omap for multi-platform
support
- represent mailbox device data through platform data/hwmod attrs
- move the omap mailbox code out of plat-omap/mach-omapX to
drivers/mailbox folder.
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/omap1_defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/omap1_defconfig b/arch/arm/configs/omap1_defconfig index 9940f7b..d74edba 100644 --- a/arch/arm/configs/omap1_defconfig +++ b/arch/arm/configs/omap1_defconfig @@ -26,7 +26,8 @@ CONFIG_ARCH_OMAP=y CONFIG_ARCH_OMAP1=y CONFIG_OMAP_RESET_CLOCKS=y # CONFIG_OMAP_MUX is not set -CONFIG_OMAP_MBOX_FWK=y +CONFIG_MAILBOX=y +CONFIG_OMAP1_MBOX=y CONFIG_OMAP_32K_TIMER=y CONFIG_OMAP_DM_TIMER=y CONFIG_ARCH_OMAP730=y |