diff options
| author | Olof Johansson <olof@lixom.net> | 2011-11-09 17:02:13 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-11-09 17:02:13 -0800 |
| commit | 3cdc3acc62527ab9544c2820b5e5da482a105240 (patch) | |
| tree | 72e204d29562c5233517d5b84cbe72dd3e5d213b /arch/arm/mach-msm/board-msm8x60.c | |
| parent | 3c52b2be1804ed553df8df47213b58fedc93c5ab (diff) | |
| parent | eca55f4d9c1d918c2aa95fb8a73a34e2ba8a1b11 (diff) | |
| download | talos-op-linux-3cdc3acc62527ab9544c2820b5e5da482a105240.tar.gz talos-op-linux-3cdc3acc62527ab9544c2820b5e5da482a105240.zip | |
Merge branch 'msm-fix' of git://codeaurora.org/quic/kernel/davidb/linux-msm into fixes
Diffstat (limited to 'arch/arm/mach-msm/board-msm8x60.c')
| -rw-r--r-- | arch/arm/mach-msm/board-msm8x60.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-msm/board-msm8x60.c b/arch/arm/mach-msm/board-msm8x60.c index cf38e2284fa9..44bf71688373 100644 --- a/arch/arm/mach-msm/board-msm8x60.c +++ b/arch/arm/mach-msm/board-msm8x60.c @@ -28,8 +28,8 @@ #include <mach/board.h> #include <mach/msm_iomap.h> -static void __init msm8x60_fixup(struct machine_desc *desc, struct tag *tag, - char **cmdline, struct meminfo *mi) +static void __init msm8x60_fixup(struct tag *tag, char **cmdline, + struct meminfo *mi) { for (; tag->hdr.size; tag = tag_next(tag)) if (tag->hdr.tag == ATAG_MEM && |
