Index: uspace/drv/char/i8042/i8042.c
===================================================================
--- uspace/drv/char/i8042/i8042.c	(revision 38ec02ecebdaf83bc3a1f3b27eddb5dbf9a8d6b1)
+++ uspace/drv/char/i8042/i8042.c	(revision 7f1669fe501c2d7c9779148576f059af4e423c9a)
@@ -108,5 +108,5 @@
 static uintptr_t i8042_physical;
 static uintptr_t i8042_kernel;
-static i8042_t * i8042;
+static i8042_regs_t * i8042;
 
 static i8042_port_t i8042_port[MAX_DEVS];
@@ -169,5 +169,5 @@
 	
 	void *vaddr;
-	if (pio_enable((void *) i8042_physical, sizeof(i8042_t), &vaddr) != 0)
+	if (pio_enable((void *) i8042_physical, sizeof(i8042_regs_t), &vaddr) != 0)
 		return -1;
 	
@@ -195,6 +195,6 @@
 		(void) pio_read_8(&i8042->data);
 
-	i8042_kbd.cmds[0].addr = (void *) &((i8042_t *) i8042_kernel)->status;
-	i8042_kbd.cmds[3].addr = (void *) &((i8042_t *) i8042_kernel)->data;
+	i8042_kbd.cmds[0].addr = (void *) &((i8042_regs_t *) i8042_kernel)->status;
+	i8042_kbd.cmds[3].addr = (void *) &((i8042_regs_t *) i8042_kernel)->data;
 	register_irq(inr_a, device_assign_devno(), 0, &i8042_kbd);
 	register_irq(inr_b, device_assign_devno(), 0, &i8042_kbd);
Index: uspace/drv/char/i8042/i8042.h
===================================================================
--- uspace/drv/char/i8042/i8042.h	(revision 38ec02ecebdaf83bc3a1f3b27eddb5dbf9a8d6b1)
+++ uspace/drv/char/i8042/i8042.h	(revision 7f1669fe501c2d7c9779148576f059af4e423c9a)
@@ -44,10 +44,9 @@
 
 /** i8042 HW I/O interface */
-struct i8042 {
+typedef struct {
 	ioport8_t data;
 	uint8_t pad[3];
 	ioport8_t status;
-} __attribute__ ((packed));
-typedef struct i8042 i8042_t;
+} __attribute__ ((packed)) i8042_regs_t;
 
 /** Softstate structure, one for each serial port (primary and aux). */