diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-29 09:00:57 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-29 09:00:57 -0700 |
commit | ca364d8388602b5c0d607c5452774833cc1ad667 (patch) | |
tree | 4c6aa0a71c89b813c73c112391005fc00e44841a /drivers/staging/tidspbridge/include/dspbridge/cfgdefs.h | |
parent | 84fd7bdf1266ee6228319903af7e58702745024d (diff) | |
parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
download | kernel_goldelico_gta04-ca364d8388602b5c0d607c5452774833cc1ad667.tar.gz kernel_goldelico_gta04-ca364d8388602b5c0d607c5452774833cc1ad667.tar.bz2 kernel_goldelico_gta04-ca364d8388602b5c0d607c5452774833cc1ad667.zip |
Merge 3.7-rc3 into tty-next
This merges the tty changes in 3.7-rc3 into tty-next
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/tidspbridge/include/dspbridge/cfgdefs.h')
-rw-r--r-- | drivers/staging/tidspbridge/include/dspbridge/cfgdefs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/tidspbridge/include/dspbridge/cfgdefs.h b/drivers/staging/tidspbridge/include/dspbridge/cfgdefs.h index 60a278136bd..b32c75673ab 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/cfgdefs.h +++ b/drivers/staging/tidspbridge/include/dspbridge/cfgdefs.h @@ -53,8 +53,8 @@ struct cfg_hostres { u32 chnl_buf_size; u32 num_chnls; void __iomem *per_base; - u32 per_pm_base; - u32 core_pm_base; + void __iomem *per_pm_base; + void __iomem *core_pm_base; void __iomem *dmmu_base; }; |