diff options
author | Nathan Scott <nathans@sgi.com> | 2006-06-20 06:56:23 +0200 |
---|---|---|
committer | Nathan Scott <nathans@sgi.com> | 2006-06-20 06:56:23 +0200 |
commit | 98174e46974323e4941c72e46345f7277755e146 (patch) | |
tree | c4644c8f38a519cfb3929d1175fc7107eefe48b9 /arch/mips/galileo-boards/ev96100/setup.c | |
parent | [XFS] Remove files from the build that are now unused. (diff) | |
parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
download | linux-98174e46974323e4941c72e46345f7277755e146.tar.xz linux-98174e46974323e4941c72e46345f7277755e146.zip |
Merge HEAD from ../linux-2.6
Diffstat (limited to 'arch/mips/galileo-boards/ev96100/setup.c')
-rw-r--r-- | arch/mips/galileo-boards/ev96100/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/galileo-boards/ev96100/setup.c b/arch/mips/galileo-boards/ev96100/setup.c index 78dbb18edeb8..a04aea6123da 100644 --- a/arch/mips/galileo-boards/ev96100/setup.c +++ b/arch/mips/galileo-boards/ev96100/setup.c @@ -55,7 +55,7 @@ extern void mips_reboot_setup(void); unsigned char mac_0_1[12]; -void __init plat_setup(void) +void __init plat_mem_setup(void) { unsigned int config = read_c0_config(); unsigned int status = read_c0_status(); |