Index: kernel/arch/sparc64/include/drivers/ns16550.h
===================================================================
--- kernel/arch/sparc64/include/drivers/ns16550.h	(revision 9b35499759aea1863b4a5b9ea28a713e50adcb90)
+++ kernel/arch/sparc64/include/drivers/ns16550.h	(revision 1378b2bc1021b18bb8b0e27b71625f9a4bd5182c)
@@ -36,64 +36,4 @@
 #define KERN_sparc64_NS16550_H_
 
-#include <arch/types.h>
-#include <arch/drivers/kbd.h>
-
-/* NS16550 registers */
-#define RBR_REG		0	/** Receiver Buffer Register. */
-#define IER_REG		1	/** Interrupt Enable Register. */
-#define IIR_REG		2	/** Interrupt Ident Register (read). */
-#define FCR_REG		2	/** FIFO control register (write). */
-#define LCR_REG		3	/** Line Control register. */
-#define LSR_REG		5	/** Line Status Register. */
-
-#define IER_ERBFI	0x01	/** Enable Receive Buffer Full Interrupt. */
-
-#define LCR_DLAB	0x80	/** Divisor Latch Access bit. */
-
-/** Structure representing the ns16550 device. */
-typedef struct {
-	devno_t devno;
-	volatile uint8_t *reg;	/** Memory mapped registers of the ns16550. */
-} ns16550_t;
-
-static inline uint8_t ns16550_rbr_read(ns16550_t *dev)
-{
-	return dev->reg[RBR_REG];
-}
-
-static inline uint8_t ns16550_ier_read(ns16550_t *dev)
-{
-	return dev->reg[IER_REG];
-}
-
-static inline void ns16550_ier_write(ns16550_t *dev, uint8_t v)
-{
-	dev->reg[IER_REG] = v;
-}
-
-static inline uint8_t ns16550_iir_read(ns16550_t *dev)
-{
-	return dev->reg[IIR_REG];
-}
-
-static inline void ns16550_fcr_write(ns16550_t *dev, uint8_t v)
-{
-	dev->reg[FCR_REG] = v;
-}
-
-static inline uint8_t ns16550_lcr_read(ns16550_t *dev)
-{
-	return dev->reg[LCR_REG];
-}
-
-static inline void ns16550_lcr_write(ns16550_t *dev, uint8_t v)
-{
-	dev->reg[LCR_REG] = v;
-}
-
-static inline uint8_t ns16550_lsr_read(ns16550_t *dev)
-{
-	return dev->reg[LSR_REG];
-}
 
 #endif