Commit 9e7bcbe8 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'msm-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into fixes

From David Brown:
  "Here are some fixes for msm that fix problems caused by the latest
   ARM code.  The ones from Daniel remove unneeded fixups that now
   cause compilation failures.  Mine fix section mismatches, that were
   incompletely fixed earlier."

* 'msm-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm:
  ARM: msm: Fix section mismatches in proc_comm.c
  video: msm: Fix section mismatches in mddi.c
  arm: msm: trout: fix compile failure
  arm: msm: halibut: remove unneeded fixup
parents 00341028 af33eadc
...@@ -86,9 +86,6 @@ static void __init halibut_init(void) ...@@ -86,9 +86,6 @@ static void __init halibut_init(void)
static void __init halibut_fixup(struct tag *tags, char **cmdline, static void __init halibut_fixup(struct tag *tags, char **cmdline,
struct meminfo *mi) struct meminfo *mi)
{ {
mi->nr_banks=1;
mi->bank[0].start = PHYS_OFFSET;
mi->bank[0].size = (101*1024*1024);
} }
static void __init halibut_map_io(void) static void __init halibut_map_io(void)
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/system_info.h>
#include <mach/msm_fb.h> #include <mach/msm_fb.h>
#include <mach/vreg.h> #include <mach/vreg.h>
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/clkdev.h> #include <linux/clkdev.h>
#include <asm/system_info.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
......
...@@ -121,7 +121,7 @@ int msm_proc_comm(unsigned cmd, unsigned *data1, unsigned *data2) ...@@ -121,7 +121,7 @@ int msm_proc_comm(unsigned cmd, unsigned *data1, unsigned *data2)
* and unknown state. This function should be called early to * and unknown state. This function should be called early to
* wait on the ARM9. * wait on the ARM9.
*/ */
void __init proc_comm_boot_wait(void) void __devinit proc_comm_boot_wait(void)
{ {
void __iomem *base = MSM_SHARED_RAM_BASE; void __iomem *base = MSM_SHARED_RAM_BASE;
......
...@@ -420,7 +420,7 @@ static void mddi_resume(struct msm_mddi_client_data *cdata) ...@@ -420,7 +420,7 @@ static void mddi_resume(struct msm_mddi_client_data *cdata)
mddi_set_auto_hibernate(&mddi->client_data, 1); mddi_set_auto_hibernate(&mddi->client_data, 1);
} }
static int __init mddi_get_client_caps(struct mddi_info *mddi) static int __devinit mddi_get_client_caps(struct mddi_info *mddi)
{ {
int i, j; int i, j;
...@@ -622,9 +622,9 @@ uint32_t mddi_remote_read(struct msm_mddi_client_data *cdata, uint32_t reg) ...@@ -622,9 +622,9 @@ uint32_t mddi_remote_read(struct msm_mddi_client_data *cdata, uint32_t reg)
static struct mddi_info mddi_info[2]; static struct mddi_info mddi_info[2];
static int __init mddi_clk_setup(struct platform_device *pdev, static int __devinit mddi_clk_setup(struct platform_device *pdev,
struct mddi_info *mddi, struct mddi_info *mddi,
unsigned long clk_rate) unsigned long clk_rate)
{ {
int ret; int ret;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment