tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'msm-fix' of git://codeaurora.org/quic/kernel/davidb/linux-msm into fixes
+11
-6
+2
arch/arm/mach-msm/Makefile
+2
arch/arm/mach-msm/Makefile
+2
-2
arch/arm/mach-msm/board-msm7x30.c
+2
-2
arch/arm/mach-msm/board-msm7x30.c
···
42
42
43
43
extern struct sys_timer msm_timer;
44
44
45
-
static void __init msm7x30_fixup(struct machine_desc *desc, struct tag *tag,
46
-
char **cmdline, struct meminfo *mi)
45
+
static void __init msm7x30_fixup(struct tag *tag, char **cmdline,
46
+
struct meminfo *mi)
47
47
{
48
48
for (; tag->hdr.size; tag = tag_next(tag))
49
49
if (tag->hdr.tag == ATAG_MEM && tag->u.mem.start == 0x200000) {
+2
-2
arch/arm/mach-msm/board-msm8960.c
+2
-2
arch/arm/mach-msm/board-msm8960.c
···
32
32
33
33
#include "devices.h"
34
34
35
-
static void __init msm8960_fixup(struct machine_desc *desc, struct tag *tag,
36
-
char **cmdline, struct meminfo *mi)
35
+
static void __init msm8960_fixup(struct tag *tag, char **cmdline,
36
+
struct meminfo *mi)
37
37
{
38
38
for (; tag->hdr.size; tag = tag_next(tag))
39
39
if (tag->hdr.tag == ATAG_MEM &&
+2
-2
arch/arm/mach-msm/board-msm8x60.c
+2
-2
arch/arm/mach-msm/board-msm8x60.c
···
28
28
#include <mach/board.h>
29
29
#include <mach/msm_iomap.h>
30
30
31
-
static void __init msm8x60_fixup(struct machine_desc *desc, struct tag *tag,
32
-
char **cmdline, struct meminfo *mi)
31
+
static void __init msm8x60_fixup(struct tag *tag, char **cmdline,
32
+
struct meminfo *mi)
33
33
{
34
34
for (; tag->hdr.size; tag = tag_next(tag))
35
35
if (tag->hdr.tag == ATAG_MEM &&