diff --git a/[refs] b/[refs] index c62ebf896936..1c29d66c2d60 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93ad12cf1a8c3be46d66581a7acaa1c7fce590e2 +refs/heads/master: ace5a3ce40bb90f14953c5e3f73e9cf1176b1a28 diff --git a/trunk/drivers/staging/tidspbridge/Kconfig b/trunk/drivers/staging/tidspbridge/Kconfig index 93de4f2e8bf8..ff64d464143c 100644 --- a/trunk/drivers/staging/tidspbridge/Kconfig +++ b/trunk/drivers/staging/tidspbridge/Kconfig @@ -6,6 +6,7 @@ menuconfig TIDSPBRIDGE tristate "DSP Bridge driver" depends on ARCH_OMAP3 select OMAP_MBOX_FWK + select OMAP_IOMMU help DSP/BIOS Bridge is designed for platforms that contain a GPP and one or more attached DSPs. The GPP is considered the master or