Merge branch 'stable-3.17' of git://git.infradead.org/users/pcmoore/selinux

[cascardo/linux.git] / arch / arm / mach-omap2 / omap_hwmod_33xx_43xx_interconnect_data.c

diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c
index e2db378..8f5989d 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c
@@ -317,21 +317,11 @@ struct omap_hwmod_ocp_if am33xx_l4_per__i2c3 = {
        .user           = OCP_USER_MPU,
 };
 
-static struct omap_hwmod_addr_space am33xx_mailbox_addrs[] = {
-       {
-               .pa_start       = 0x480C8000,
-               .pa_end         = 0x480C8000 + (SZ_4K - 1),
-               .flags          = ADDR_TYPE_RT
-       },
-       { }
-};
-
 /* l4 ls -> mailbox */
 struct omap_hwmod_ocp_if am33xx_l4_per__mailbox = {
        .master         = &am33xx_l4_ls_hwmod,
        .slave          = &am33xx_mailbox_hwmod,
        .clk            = "l4ls_gclk",
-       .addr           = am33xx_mailbox_addrs,
        .user           = OCP_USER_MPU,
 };