diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-02 00:02:01 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-02 00:02:01 +0200 |
| commit | e3ee3b78f83688a0ae4315e8be71b2eac559904a (patch) | |
| tree | deb03bcdd020262af450ed23382d7c921263f5cf /arch/ppc64/boot/addnote.c | |
| parent | [PATCH] ieee80211: Fix debug comments ipw->ieee80211 (diff) | |
| parent | Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jg... (diff) | |
| download | linux-e3ee3b78f83688a0ae4315e8be71b2eac559904a.tar.xz linux-e3ee3b78f83688a0ae4315e8be71b2eac559904a.zip | |
/spare/repo/netdev-2.6 branch 'master'
Diffstat (limited to 'arch/ppc64/boot/addnote.c')
| -rw-r--r-- | arch/ppc64/boot/addnote.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc64/boot/addnote.c b/arch/ppc64/boot/addnote.c index 719663a694bb..8041a9845ab7 100644 --- a/arch/ppc64/boot/addnote.c +++ b/arch/ppc64/boot/addnote.c @@ -157,7 +157,7 @@ main(int ac, char **av) PUT_32BE(ns, strlen(arch) + 1); PUT_32BE(ns + 4, N_DESCR * 4); PUT_32BE(ns + 8, 0x1275); - strcpy(&buf[ns + 12], arch); + strcpy((char *) &buf[ns + 12], arch); ns += 12 + strlen(arch) + 1; for (i = 0; i < N_DESCR; ++i, ns += 4) PUT_32BE(ns, descr[i]); @@ -172,7 +172,7 @@ main(int ac, char **av) PUT_32BE(ns, strlen(rpaname) + 1); PUT_32BE(ns + 4, sizeof(rpanote)); PUT_32BE(ns + 8, 0x12759999); - strcpy(&buf[ns + 12], rpaname); + strcpy((char *) &buf[ns + 12], rpaname); ns += 12 + ROUNDUP(strlen(rpaname) + 1); for (i = 0; i < N_RPA_DESCR; ++i, ns += 4) PUT_32BE(ns, rpanote[i]); |