diff options
| author | Tejun Heo <tj@kernel.org> | 2009-07-03 18:13:18 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-07-03 18:13:18 -0400 |
| commit | c43768cbb7655ea5ff782ae250f6e2ef4297cf98 (patch) | |
| tree | 3982e41dde3eecaa3739a5d1a8ed18d04bd74f01 /drivers/mtd/cmdlinepart.c | |
| parent | 1a8dd307cc0a2119be4e578c517795464e6dabba (diff) | |
| parent | 746a99a5af60ee676afa2ba469ccd1373493c7e7 (diff) | |
Merge branch 'master' into for-next
Pull linus#master to merge PER_CPU_DEF_ATTRIBUTES and alpha build fix
changes. As alpha in percpu tree uses 'weak' attribute instead of
inline assembly, there's no need for __used attribute.
Conflicts:
arch/alpha/include/asm/percpu.h
arch/mn10300/kernel/vmlinux.lds.S
include/linux/percpu-defs.h
Diffstat (limited to 'drivers/mtd/cmdlinepart.c')
| -rw-r--r-- | drivers/mtd/cmdlinepart.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/cmdlinepart.c b/drivers/mtd/cmdlinepart.c index 5011fa73f918..1479da6d3aa6 100644 --- a/drivers/mtd/cmdlinepart.c +++ b/drivers/mtd/cmdlinepart.c | |||
| @@ -194,7 +194,7 @@ static struct mtd_partition * newpart(char *s, | |||
| 194 | parts[this_part].name = extra_mem; | 194 | parts[this_part].name = extra_mem; |
| 195 | extra_mem += name_len + 1; | 195 | extra_mem += name_len + 1; |
| 196 | 196 | ||
| 197 | dbg(("partition %d: name <%s>, offset %x, size %x, mask flags %x\n", | 197 | dbg(("partition %d: name <%s>, offset %llx, size %llx, mask flags %x\n", |
| 198 | this_part, | 198 | this_part, |
| 199 | parts[this_part].name, | 199 | parts[this_part].name, |
| 200 | parts[this_part].offset, | 200 | parts[this_part].offset, |