diff options
author | Igor Mammedov <niallain@gmail.com> | 2008-04-29 01:08:21 +0200 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2008-04-29 01:08:21 +0200 |
commit | e9f20d6f03e8df393b001dab6dc5226c2a5daf57 (patch) | |
tree | 73e94fa5e4f83576c97e36187b809c5aad2ade30 /arch/mips/vr41xx/common/init.c | |
parent | [CIFS] fixed compatibility issue with samba refferal request (diff) | |
parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
download | linux-e9f20d6f03e8df393b001dab6dc5226c2a5daf57.tar.xz linux-e9f20d6f03e8df393b001dab6dc5226c2a5daf57.zip |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/mips/vr41xx/common/init.c')
-rw-r--r-- | arch/mips/vr41xx/common/init.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/mips/vr41xx/common/init.c b/arch/mips/vr41xx/common/init.c index 76d4b5ed3fc0..c64995342ba8 100644 --- a/arch/mips/vr41xx/common/init.c +++ b/arch/mips/vr41xx/common/init.c @@ -1,7 +1,7 @@ /* * init.c, Common initialization routines for NEC VR4100 series. * - * Copyright (C) 2003-2005 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> + * Copyright (C) 2003-2008 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -53,6 +53,8 @@ void __init plat_time_init(void) void __init plat_mem_setup(void) { iomem_resource_init(); + + vr41xx_siu_setup(); } void __init prom_init(void) |