5 files changed, 2 insertions, 59 deletions
diff --git a/include/asm-i386/keyboard.h b/include/asm-i386/keyboard.h
index 76fa2186c..ed6c7d472 100644
--- a/include/asm-i386/keyboard.h
+++ b/include/asm-i386/keyboard.h
@@ -12,6 +12,8 @@
 
 #define KEYBOARD_IRQ 1
 
+#define KBD_REPORT_ERR
+
 #define kbd_inb_p(port) inb_p(port)
 #define kbd_inb(port) inb(port)
 #define kbd_outb_p(data,port) outb_p(data,port)
diff --git a/include/asm-i386/mc146818rtc.h b/include/asm-i386/mc146818rtc.h
deleted file mode 100644
index 594996a6d..000000000
--- a/include/asm-i386/mc146818rtc.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Machine dependend access functions for RTC registers.
- */
-#ifndef __ASM_I386_MC146818RTC_H
-#define __ASM_I386_MC146818RTC_H
-
-#include <asm/io.h>
-
-#ifndef RTC_PORT
-#define RTC_PORT(x)	(0x70 + (x))
-#define RTC_ALWAYS_BCD	1
-#endif
-
-#define CMOS_READ(addr) ({ \
-outb_p((addr),RTC_PORT(0)); \
-inb_p(RTC_PORT(1)); \
-})
-#define CMOS_WRITE(val, addr) ({ \
-outb_p((addr),RTC_PORT(0)); \
-outb_p((val),RTC_PORT(1)); \
-})
-
-#endif /* __ASM_I386_MC146818RTC_H */
diff --git a/include/asm-i386/page.h b/include/asm-i386/page.h
index e5fc37276..4744df9c8 100644
--- a/include/asm-i386/page.h
+++ b/include/asm-i386/page.h
@@ -53,20 +53,6 @@ typedef unsigned long pgprot_t;
 
 #endif
 
-/*
- * We special-case the C-O-W ZERO_PAGE, because it's such
- * a common occurrence (no need to read the page to know
- * that it's zero - better for the cache and memory subsystem).
- */
-extern inline inline void copy_page(unsigned long from, unsigned long to)
-{
-	if (from == ZERO_PAGE) {
-		memset((void *) to, 0, PAGE_SIZE);
-		return;
-	}
-	memcpy((void *) to, (void *) from, PAGE_SIZE);
-}
-
 /* to align the pointer to the (next) page boundary */
 #define PAGE_ALIGN(addr)	(((addr)+PAGE_SIZE-1)&PAGE_MASK)
 
diff --git a/include/asm-i386/slots.h b/include/asm-i386/slots.h
deleted file mode 100644
index 21139c59c..000000000
--- a/include/asm-i386/slots.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * include/asm-i386/slots.h
- *
- * Written by Ralf Baechle
- * Copyright (C) 1994 by Waldorf GMBH
- */
-#ifndef _ASM_I386_SLOTS_H
-#define _ASM_I386_SLOTS_H
-
-/*
- * SLOTSPACE is the address to which the physical address 0
- * of the Slotspace is mapped by the chipset in the main CPU's
- * address space.
- */
-#define SLOTSPACE 0x0
-
-#endif /* _ASM_I386_SLOTS_H */
diff --git a/include/asm-i386/system.h b/include/asm-i386/system.h
index ae8c56a96..cef63f6fe 100644
--- a/include/asm-i386/system.h
+++ b/include/asm-i386/system.h
@@ -298,9 +298,4 @@ extern struct desc_struct default_ldt;
 void disable_hlt(void);
 void enable_hlt(void);
 
-/*
- * Reset the machine.
- */
-extern void hard_reset_now(void);
-
 #endif