Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / arch / mips / mips-boards / atlas / atlas_setup.c

diff --git a/arch/mips/mips-boards/atlas/atlas_setup.c b/arch/mips/mips-boards/atlas/atlas_setup.c
index 873cf3141a31961002fef869527c4ed98bbac000..3a7c3d28aa0d4d5671af23b0ac417a6396a78a35 100644 (file)
--- a/arch/mips/mips-boards/atlas/atlas_setup.c
+++ b/arch/mips/mips-boards/atlas/atlas_setup.c
@@ -15,7 +15,6 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
  */
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/sched.h>
@@ -50,7 +49,7 @@ const char *get_system_type(void)
        return "MIPS Atlas";
 }
 
-void __init plat_setup(void)
+void __init plat_mem_setup(void)
 {
        mips_pcibios_init();
 
@@ -65,7 +64,7 @@ void __init plat_setup(void)
 
        board_time_init = mips_time_init;
        board_timer_setup = mips_timer_setup;
-       rtc_get_time = mips_rtc_get_time;
+       rtc_mips_get_time = mips_rtc_get_time;
 }
 
 static void __init serial_init(void)