diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-06-20 16:36:38 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-06-20 16:36:38 -0400 |
| commit | 75ba632a01d4dc70d0a0f3a92b5ec9b4a3644b2d (patch) | |
| tree | c2f02ee30609d0d69308b4ca80d68d02a5f85552 /arch/mips/sgi-ip22/ip22-setup.c | |
| parent | 0fd1ffe0633b4b039b343b753598e6df435e034d (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/mips/sgi-ip22/ip22-setup.c')
| -rw-r--r-- | arch/mips/sgi-ip22/ip22-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/sgi-ip22/ip22-setup.c b/arch/mips/sgi-ip22/ip22-setup.c index 7018e1833e85..d7138906eb10 100644 --- a/arch/mips/sgi-ip22/ip22-setup.c +++ b/arch/mips/sgi-ip22/ip22-setup.c | |||
| @@ -53,7 +53,7 @@ EXPORT_SYMBOL(ip22_do_break); | |||
| 53 | extern void ip22_be_init(void) __init; | 53 | extern void ip22_be_init(void) __init; |
| 54 | extern void ip22_time_init(void) __init; | 54 | extern void ip22_time_init(void) __init; |
| 55 | 55 | ||
| 56 | void __init plat_setup(void) | 56 | void __init plat_mem_setup(void) |
| 57 | { | 57 | { |
| 58 | char *ctype; | 58 | char *ctype; |
| 59 | char *cserial; | 59 | char *cserial; |