Use standard no-rtc.c.

3 files changed, 3 insertions, 54 deletions

diff --git a/arch/mips/galileo-boards/ev96100/Makefile b/arch/mips/galileo-boards/ev96100/Makefile
index 147cbb806..641664c7d 100644
--- a/arch/mips/galileo-boards/ev96100/Makefile
+++ b/arch/mips/galileo-boards/ev96100/Makefile
@@ -17,7 +17,6 @@
 
 O_TARGET:= ev96100.o
 
-obj-y	:= prom.o time.o rtc.o irq.o int-handler.o setup.o puts.o uart.o \
-	   memory.o
+obj-y	:= prom.o time.o irq.o int-handler.o setup.o puts.o uart.o memory.o
 
 include $(TOPDIR)/Rules.make
diff --git a/arch/mips/galileo-boards/ev96100/rtc.c b/arch/mips/galileo-boards/ev96100/rtc.c
deleted file mode 100644
index 697926815..000000000
--- a/arch/mips/galileo-boards/ev96100/rtc.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *
- * BRIEF MODULE DESCRIPTION
- *	Galileo EV96100 rtc routines (no rtc on the EV96100).
- *
- * Copyright 2000 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
- *         	ppopov@mvista.com or support@mvista.com
- *
- *  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 the
- *  Free Software Foundation;  either version 2 of the  License, or (at your
- *  option) any later version.
- *
- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  You should have received a copy of the  GNU General Public License along
- *  with this program; if not, write  to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <linux/mc146818rtc.h>
-static unsigned char ev96100_rtc_read_data(unsigned long addr)
-{
-	return 0;
-}
-
-static void ev96100_rtc_write_data(unsigned char data, unsigned long addr)
-{
-}
-
-static int ev96100_rtc_bcd_mode(void)
-{
-	return 0;
-}
-
-struct rtc_ops ev96100_rtc_ops = {
-	&ev96100_rtc_read_data,
-	&ev96100_rtc_write_data,
-	&ev96100_rtc_bcd_mode
-};
diff --git a/arch/mips/galileo-boards/ev96100/setup.c b/arch/mips/galileo-boards/ev96100/setup.c
index 6064ff767..bfcd479a1 100644
--- a/arch/mips/galileo-boards/ev96100/setup.c
+++ b/arch/mips/galileo-boards/ev96100/setup.c
@@ -64,7 +64,7 @@ void (*board_time_init) (struct irqaction * irq);
 extern void ev96100_time_init(struct irqaction *irq);
 
 extern void mips_reboot_setup(void);
-extern struct rtc_ops ev96100_rtc_ops;
+extern struct rtc_ops no_rtc_ops;
 extern struct resource ioport_resource;
 
 static void __init ev96100_irq_setup(void)
@@ -153,7 +153,7 @@ void __init ev96100_setup(void)
 	argptr = prom_getcmdline();
 
 	board_time_init = ev96100_time_init;
-	rtc_ops = &ev96100_rtc_ops;
+	rtc_ops = &no_rtc_ops;
 	mips_reboot_setup();
 
 	/*